Skip to content

Commit

Permalink
Remove macro redefinitions that cause issues with Open XL
Browse files Browse the repository at this point in the history
Couple instances where the toupper() and tolower() macros
are undef and re-defined that cause problems with the
native headers. These may be unnecessary and are removed.

Signed-off-by: Gaurav Chaudhari <[email protected]>
  • Loading branch information
Deigue committed Jul 18, 2024
1 parent 56cb81f commit faf7d43
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
6 changes: 0 additions & 6 deletions ddr/include/ddr/std/string.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@
#if defined(J9ZOS390)

#include <ctype.h>
#undef toupper
#undef tolower

#include <string>

#define toupper(c) (islower(c) ? (c & _XUPPER_ASCII) : c)
#define tolower(c) (isupper(c) ? (c | _XLOWER_ASCII) : c)

#else /* defined(J9ZOS390) */
#include <string>
#endif /* defined(J9ZOS390) */
Expand Down
7 changes: 0 additions & 7 deletions ddr/include/ddr/std/unordered_map.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

#if defined(J9ZOS390)
#include <ctype.h>
#undef toupper
#undef tolower
#endif /* defined(J9ZOS390) */

#include <unordered_map>
Expand All @@ -38,9 +36,4 @@ using std::unordered_map;
using std::tr1::unordered_map;
#endif /* defined(OMR_HAVE_CXX11) */

#if defined(J9ZOS390)
#define toupper(c) (islower(c) ? (c & _XUPPER_ASCII) : c)
#define tolower(c) (isupper(c) ? (c | _XLOWER_ASCII) : c)
#endif /* defined(J9ZOS390) */

#endif /* DDR_UNORDERED_MAP */

0 comments on commit faf7d43

Please sign in to comment.