34,38c34,36
< //TORLAB DEBUG original  #  if __EXTENDED__ && __COMPILER_VER__ >= 0x22060000
< #  if _LONG_LONG && __COMPILER_VER__ >= 0x22060000
< //TORLAB DEBUG uncommented the next 2 lines
< #   define _STLP_LONG_LONG long long
< #  endif
---
> // #  if __EXTENDED__ && __COMPILER_VER__ >= 0x22060000
> // #   define _STLP_LONG_LONG long long
> // #  endif
43,44c41
< //TORLAB DEBUG original #  define _STLP_NATIVE_INCLUDE_PATH /usr/lpp/ioclib/include
< #  define _STLP_NATIVE_INCLUDE_PATH /usr/include
---
> #  define _STLP_NATIVE_INCLUDE_PATH /usr/lpp/ioclib/include
63c60
< //TORLAB DEBUG commented out #  define _STLP_NO_BOOL 1
---
> #  define _STLP_NO_BOOL 1
66,74c63,71
< //TORLAB DEBUG commented out #  define _STLP_HAS_NO_NAMESPACES 1
< //TORLAB DEBUG commented out #  define _STLP_NEED_TYPENAME 1
< //TORLAB DEBUG commented out #  define _STLP_NEED_EXPLICIT 1
< //TORLAB DEBUG commented out #  define _STLP_NO_ARROW_OPERATOR 1
< //TORLAB DEBUG commented out #  define _STLP_NO_NEW_STYLE_CASTS 1
< //TORLAB DEBUG commented out #  define _STLP_NO_WCHAR_T 1
< //TORLAB DEBUG commented out #  define _STLP_NEED_MUTABLE 1
< //TORLAB DEBUG commented out #  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
< //TORLAB DEBUG commented out #  define _STLP_NO_BAD_ALLOC 1
---
> #  define _STLP_HAS_NO_NAMESPACES 1
> #  define _STLP_NEED_TYPENAME 1
> #  define _STLP_NEED_EXPLICIT 1
> #  define _STLP_NO_ARROW_OPERATOR 1
> #  define _STLP_NO_NEW_STYLE_CASTS 1
> #  define _STLP_NO_WCHAR_T 1
> #  define _STLP_NEED_MUTABLE 1
> #  define _STLP_NO_PARTIAL_SPECIALIZATION_SYNTAX 1
> #  define _STLP_NO_BAD_ALLOC 1
76,82c73,79
< //TORLAB DEBUG commented out #  define _STLP_NO_MEMBER_TEMPLATES 1
< //TORLAB DEBUG commented out #  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
< //TORLAB DEBUG commented out #  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
< //TORLAB DEBUG commented out #  define _STLP_NO_FRIEND_TEMPLATES 1
< //TORLAB DEBUG commented out #  define _STLP_NO_QUALIFIED_FRIENDS 1
< //TORLAB DEBUG commented out #  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
< //TORLAB DEBUG commented out #  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
---
> #  define _STLP_NO_MEMBER_TEMPLATES 1
> #  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
> #  define _STLP_NO_MEMBER_TEMPLATE_KEYWORD 1
> #  define _STLP_NO_FRIEND_TEMPLATES 1
> #  define _STLP_NO_QUALIFIED_FRIENDS 1
> #  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
> #  define _STLP_NO_FUNCTION_TMPL_PARTIAL_ORDER 1
84,88d80
< #define _STLP_NO_FORCE_INSTANTIATE 1
< 
< //TORLAB DEBUG added the following macro definition
< #define _STLP_WCHAR_IBM_EXCLUDE 1
< 
92c84
< //TORLAB DEBUG commented out #  define _STLP_NO_EXCEPTION_HEADER 1
---
> #  define _STLP_NO_EXCEPTION_HEADER 1
94,95c86,87
< //TORLAB DEBUG commented out #  define _STLP_HAS_NO_NEW_IOSTREAMS 1
< //TORLAB DEBUG commented out #  define _STLP_NO_NEW_NEW_HEADER 1
---
> #  define _STLP_HAS_NO_NEW_IOSTREAMS 1
> #  define _STLP_NO_NEW_NEW_HEADER 1
100c92
< //TORLAB DEBUG commented out #  define _STLP_NO_NEW_NEW_HEADER 1
---
> #  define _STLP_NO_NEW_NEW_HEADER 1
132,134d123
< //TORLAB DEBUG moved the following line out from the #if guards below
< #define _STLP_USE_EXCEPTIONS 1
< 
146a136,138
> 
> 
> 
