Skip to content

Commit bcf1a3a

Browse files
author
Joerg Bruehe
committed
Fix an issue with the IBM C++ compiler
which was detected during the build of 5.5.3-m3. This requires version 9 of IBM C++ to help. More fixes will still be needed, it is very strict (or rather: a bit picky?) about templates. --BZR-- revision-id: [email protected] property-branch-nick: clone-5.5 testament3-sha1: afda01fdcbcfce0411ce4ffad4f78d97cca77194
1 parent 7122b8c commit bcf1a3a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

sql/mdl.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@
1515
along with this program; if not, write to the Free Software
1616
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
1717

18+
#if defined(__IBMC__) || defined(__IBMCPP__)
19+
/* Further down, "next_in_lock" and "next_in_context" have the same type,
20+
and in "sql_plist.h" this leads to an identical signature, which causes
21+
problems in function overloading.
22+
*/
23+
#pragma namemangling(v5)
24+
#endif
25+
1826

1927
#include "sql_plist.h"
2028
#include <my_sys.h>

0 commit comments

Comments
 (0)