diff options
| -rw-r--r-- | ace/README | 1 | ||||
| -rw-r--r-- | ace/config-g++-common.h | 1 | ||||
| -rw-r--r-- | tests/Conn_Test.cpp | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ace/README b/ace/README index 6be9826b935..a275a0286c6 100644 --- a/ace/README +++ b/ace/README @@ -24,6 +24,7 @@ ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER ACE_HAS_ANSI_CASTS Platform supports new C++ style casts (dynamic_cast, static_cast, reinterpret_cast and const_cast) ACE_DEFAULT_THREAD_KEYS Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_. Defaults to 64. ACE_THREADS_DONT_INHERIT_LOG_MSG Specify this if you don't want threads to inherit parent thread's ACE_Log_Msg properties. +ACE_HAS_OLD_GNUG Compiling with g++ prior to version 2.8.0. ACE_HAS_ONE_DEFINITION_RULE Compiler enforces C++ One Definition Rule ACE_HAS_PRIOCNTL OS has priocntl (2). ACE_HAS_RECV_TIMEDWAIT Platform has the MIT pthreads APIs for diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 6a51d97deba..92d3eaacb62 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -53,6 +53,7 @@ #else /* ! EGCS */ // Plain old g++. # define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES +# define ACE_HAS_OLD_GNUG # define ACE_HAS_TEMPLATE_SPECIALIZATION #endif /* ! EGCS */ diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index de5167f9006..c254bee1cdb 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -180,14 +180,13 @@ Svc_Handler::idle (u_long flags) // Template specializations. Older versions of g++, such as 2.7.2.3, // can't deal with them, though. -#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) && \ - (!defined (__GNUG__) || (__GNUC__ > 2 || __GNUC_MINOR__ >= 90)) +#if defined (ACE_HAS_TEMPLATE_SPECIALIZATION) && !defined (ACE_HAS_OLD_GNUG) size_t ACE_Hash_Addr<ACE_INET_Addr>::hash_i (const ACE_INET_Addr &addr) const { return addr.get_ip_address () + addr.get_port_number (); } -#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION && egcs, if __GNUG__ */ +#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION && newer g++, if __GNUG__ */ // **************************************** |