migrated to config-g++-common.h

3 files changed, 14 insertions, 36 deletions

diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 05261208ebb..4d840cea894 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -10,15 +10,18 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+#endif /* __GNUG__ */
+
+#define ACE_HAS_STRING_CLASS
+
 // System include files are not in sys/, this gets rid of warning.
 #define __NO_INCLUDE_WARN__
 
 #define ACE_LACKS_GETOPT_PROTO
 #define ACE_HAS_STDARG_THR_DEST
 
-#define ACE_HAS_STRING_CLASS
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
 // ACE_HAS_EXCEPTIONS requires -fhandle-exceptions, but that gives
 // g++ 2.7.2 fits:  it spits out all kinds of warnings that it doesn't
 // without that option (and that are just wrong), and runs out of
@@ -26,13 +29,6 @@
 // So until -fhandle-exceptions gets fixed, we can't use this with g++ . . .
 // #define ACE_HAS_EXCEPTIONS
 
-// G++ doesn't support template typedefs fully (yet).
-// #define ACE_HAS_TEMPLATE_TYPEDEFS
-
-// Must specialize templates due to G++'s lame parameterized type
-// support...
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
 
@@ -48,16 +44,10 @@
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 //#define ACE_HAS_REENTRANT_FUNCTIONS
 
-// Compiler's template mechanism must see source code (i.e., .C files).
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 // Denotes that GNU has cstring.h as standard
 // which redefines memchr()
 #define ACE_HAS_GNU_CSTRING_H
 
-// Compiler doesn't support static data member templates.
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
@@ -178,10 +168,6 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_LACKS_CONDATTR_PSHARED
 
-
-// Use the poll() event demultiplexor rather than select().
-//#define ACE_USE_POLL
-
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
@@ -192,7 +178,7 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
-extern "C" 
+extern "C"
 {
   int getopt (int, char *const *, const char *);
   int putenv (const char *);
diff --git a/ace/config-sunos5.5-g++.h b/ace/config-sunos5.5-g++.h
index ce6913b4059..d3bb5e103fa 100644
--- a/ace/config-sunos5.5-g++.h
+++ b/ace/config-sunos5.5-g++.h
@@ -11,11 +11,14 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+#endif /* __GNUG__ */
+
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_STRING_CLASS
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
 #define ACE_HAS_UALARM
 #define ACE_LACKS_UALARM_PROTOTYPE
 
@@ -36,10 +39,6 @@
 
 #define ACE_HAS_TERM_IOCTLS
 
-// Must specialize templates due to G++'s lame parameterized type
-// support...
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
 #define ACE_HAS_SYSV_IPC
 
@@ -60,16 +59,10 @@
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
-// Compiler's template mechanism must see source code (i.e., .C files).
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 // Denotes that GNU has cstring.h as standard
 // which redefines memchr()
 #define ACE_HAS_GNU_CSTRING_H
 
-// Compiler doesn't support static data member templates.
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Compiler/platform correctly calls init()/fini() for shared libraries.
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index da7d4dc3622..a3537322ea1 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -16,14 +16,13 @@
 // Compiler-specific configuration.
 
 #if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+
 # define ACE_HAS_VERBOSE_NOTSUP
 # define ACE_LACKS_IOSTREAM_FX
 # define ACE_MAIN ace_main
 
-# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-# define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-# define ACE_TEMPLATES_REQUIRE_SOURCE
-
   // Even though the documentation suggests that g++/VxWorks 5.3.1
   // (Tornado 1.0.1) supports long long, Wind River tech support says
   // that it doesn't.  It causes undefined symbols for math functions.