diff options
| -rw-r--r-- | ace/Log_Priority.h | 13 | ||||
| -rw-r--r-- | ace/config-sco-5.0.0-CC-fsu-pthread.h | 1 | ||||
| -rw-r--r-- | ace/config-sunos5.5.h | 1 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
4 files changed, 6 insertions, 10 deletions
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h index 3d66d35fc32..a43f8a1ea24 100644 --- a/ace/Log_Priority.h +++ b/ace/Log_Priority.h @@ -69,17 +69,16 @@ enum ACE_Log_Priority LM_MAX = LM_EMERGENCY, // The maximum logging priority. - // Do not use!!, this enum value ensures that the underlying + // Do not use!! This enum value ensures that the underlying // integral type for this enum is at least 32 bits. -#if !defined (ACE_HAS_BROKEN_ENUMS) - ENSURE_32_BITS = 0xFFFFFFFF -#else - ENSURE_32_BITS = 0x1FFFFFFF +#if defined (ACE_HAS_BROKEN_ENUMS) + LM_ENSURE_32_BITS = 0x1FFFFFFF // HP/CXX makes an error the usage of "long enumerators", but this // one (that requires 29 bits) is OK.... only HP can come up with // something like that... -#endif /* ACE_HAS_BROKEN_ENUMS */ +#else /* ! ACE_HAS_BROKEN_ENUMS */ + LM_ENSURE_32_BITS = 0x7FFFFFFF +#endif /* ! ACE_HAS_BROKEN_ENUMS */ }; #endif /* ACE_LOG_PRIORITY_H */ - diff --git a/ace/config-sco-5.0.0-CC-fsu-pthread.h b/ace/config-sco-5.0.0-CC-fsu-pthread.h index 628ae85ef7c..8d615ffc401 100644 --- a/ace/config-sco-5.0.0-CC-fsu-pthread.h +++ b/ace/config-sco-5.0.0-CC-fsu-pthread.h @@ -4,7 +4,6 @@ #ifndef ACE_CONFIG_H #define ACE_CONFIG_H -#define ACE_HAS_BROKEN_ENUMS #define ACE_LACKS_ACE_IOSTREAM #include "ace/config-sco-5.0.0.h" #include "ace/config-fsu-pthread.h" diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h index 1d46c271c73..d5b61d073d4 100644 --- a/ace/config-sunos5.5.h +++ b/ace/config-sunos5.5.h @@ -86,7 +86,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # endif /* __STANDARD_CXX */ -# define ACE_HAS_BROKEN_ENUMS /* Necessary with 1.8.9, harmless with 1.8.8. */ # define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA # define ACE_LACKS_LINEBUFFERED_STREAMBUF # define ACE_LACKS_LONGLONG_T /* It really doesn't have it. Boo. */ diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 819acdccb38..b471378b8ce 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -61,7 +61,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # endif /* __STANDARD_CXX */ -# define ACE_HAS_BROKEN_ENUMS /* Necessary with 1.8.9, harmless with 1.8.8. */ # define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA # define ACE_HAS_WCHAR_TYPEDEFS_CHAR # define ACE_LACKS_LONGLONG_T |