X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28468136d08dfa16a4052770a6c66e2c60663941..689fceb7a725f0000102fa080d1015ab22a58489:/utils/HelpGen/src/wxstlac.h?ds=sidebyside diff --git a/utils/HelpGen/src/wxstlac.h b/utils/HelpGen/src/wxstlac.h index 9f69f1f26d..f71ef3405d 100644 --- a/utils/HelpGen/src/wxstlac.h +++ b/utils/HelpGen/src/wxstlac.h @@ -17,7 +17,9 @@ #endif #include -#include +#if !defined(__WXMAC__) || defined(__DARWIN__) +# include +#endif #include #include #include @@ -599,15 +601,16 @@ public:\ #define ___WXSTL_COMMA , -#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ +#define __DEFINE_MAP(ARG_IS_UNIQUE, KEY_TYPE, VAL_TYPE, FUNCTOR ) \ +__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ FUNCTOR,\ __WXSTLMAP_##KEY_TYPE##VAL_TYPE##ARG_IS_UNIQUE, \ struct key_value_pair { KEY_TYPE first ; \ - VAL_TYPE second;\ - key_value_pair() {}\ - key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \ - : first(key) ___WXSTL_COMMA second( value ) {} \ - } , \ + VAL_TYPE second;\ + key_value_pair() {}\ + key_value_pair( const KEY_TYPE& key ___WXSTL_COMMA const VAL_TYPE& value ) \ + : first(key) ___WXSTL_COMMA second( value ) {} \ + } , \ KEY_TYPE,\ VAL_TYPE,\ mData.first, mData.second, x.first, x.second, \ @@ -626,7 +629,8 @@ inline insert_result_iterator insert( const value_type& x )\ return result;\ } ) -#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) __DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ +#define __DEFINE_SET(ARG_IS_UNIQUE, KEY_TYPE, FUNCTOR ) \ +__DEFINE_ASOC_CLASS( ARG_IS_UNIQUE,\ FUNCTOR,\ __WXSTLSET_##TYPE##ARG_IS_UNIQUE, \ KEY_TYPE,\