migrated to config-g++-common.h

6 files changed, 87 insertions, 91 deletions

diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 8f0d6105314..ca5d91dd07f 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-// The following configuration file is designed to work for Motorolla 88k SVR4 platforms
-// using pthreads from Florida State (ACE_HAS_FSU_PTHREADS)
+// The following configuration file is designed to work for Motorola
+// 88k SVR4 platforms using pthreads from Florida State (ACE_HAS_FSU_PTHREADS).
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
@@ -11,6 +11,13 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
 #if !defined (m88k)
 #define m88k
 #endif
@@ -24,13 +31,13 @@ extern "C" void pthread_init();
 
 #if !defined (IP_ADD_MEMBERSHIP)
 #define IP_ADD_MEMBERSHIP 0x13
-#endif	/*  m88k */
+#endif  /*  m88k */
 
 #if !defined (IP_DROP_MEMBERSHIP)
 #define IP_DROP_MEMBERSHIP 0x14
-#endif	/*  m88k */
+#endif  /*  m88k */
 
-struct sched_param  
+struct sched_param
 {
   int sched_priority;
   int prio;
@@ -39,8 +46,8 @@ struct sched_param
 // This seems to be necessary for m88k.
 struct ip_mreq
 {
-  struct in_addr imr_multiaddr;	// IP multicast address of the group
-  struct in_addr imr_interface;	// local IP address of the interface
+  struct in_addr imr_multiaddr; // IP multicast address of the group
+  struct in_addr imr_interface; // local IP address of the interface
 };
 
 #if !defined (ACE_HAS_FSU_PTHREADS)
@@ -52,13 +59,10 @@ struct ip_mreq
 #define ACE_LACKS_T_ERRNO
 #define ACE_LACKS_MADVISE
 #define ACE_HAS_GNU_CSTRING_H
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-#endif	/* m88k */
+#endif  /* m88k */
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Sun has the wrong prototype for sendmsg.
 #define ACE_HAS_BROKEN_SENDMSG
@@ -81,7 +85,7 @@ struct ip_mreq
 #if !defined (ACE_HAS_FSU_PTHREADS)
 // Platform supports reentrant functions (i.e., all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
-#endif	/* ACE_HAS_FSU_PTHREADS */
+#endif  /* ACE_HAS_FSU_PTHREADS */
 
 // Platform has terminal ioctl flags like TCGETS and TCSETS.
 #define ACE_HAS_TERM_IOCTLS
@@ -98,18 +102,18 @@ struct ip_mreq
 #if !defined (m88k)
 // Compiler/platform supports SunOS high resolution timers.
 #define ACE_HAS_HI_RES_TIMER
-#endif 	/* m88k */
+#endif  /* m88k */
 
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
 // Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
+#define ACE_HAS_ALLOCA
 
 #if !defined (m88k)
 // Compiler/platform has <alloca.h>
 #define ACE_HAS_ALLOCA_H
-#endif	/* m88k */
+#endif  /* m88k */
 
 // Sockets may be called in multi-threaded programs.
 #define ACE_HAS_MT_SAFE_SOCKETS
@@ -127,7 +131,7 @@ struct ip_mreq
 #if !defined (m88k)
 // Platform supports the prusage_t struct.
 #define ACE_HAS_PRUSAGE_T
-#endif	/* m88k */
+#endif  /* m88k */
 
 // Compiler/platform defines the sig_atomic_t typedef.
 #define ACE_HAS_SIG_ATOMIC_T
@@ -172,12 +176,12 @@ struct ip_mreq
 #if !defined (m88k)
 // Compiler/platform supports sys_siglist array.
 #define ACE_HAS_SYS_SIGLIST
-#endif	/* m88k */
+#endif  /* m88k */
 
 /* Turn off the following five defines if you want to disable threading. */
 // Compile using multi-thread libraries.
 #if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
 #endif
 
 #define ACE_HAS_PTHREADS
@@ -188,7 +192,7 @@ struct ip_mreq
 
 #if defined (ACE_HAS_FSU_PTHREADS)
 #define ACE_LACKS_THREAD_STACK_ADDR
-#endif	/*  ACE_HAS_FSU_PTHREADS */
+#endif  /*  ACE_HAS_FSU_PTHREADS */
 
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 3885ab65c8d..a65b6620459 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -4,7 +4,7 @@
 // ***** This configuration file is still under testing. *****
 
 // The following configuration file is designed to work for NetBSD
-// platforms using GNU C++ 
+// platforms using GNU g++.
 
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
@@ -13,6 +13,10 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+#endif /* __GNUG__ */
+
 // ********************************************************
 // uncomment next line if you are using FreeBSD 2.1.x[R]
 // #define FreeBSD_2_1
@@ -160,18 +164,6 @@ ange */
 #define ACE_HAS_MSG
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 
-// TDN - adapted from file for SunOS4 platforms using the GNU g++ compiler
-// Compiler's template mechanism must see source code (i.e., .C files).
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
-// Compiler doesn't support static data member templates.
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-// #define ACE_HAS_SIGWAIT
-
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h
index 5fd66af8e64..8963b9109aa 100644
--- a/ace/config-psosim-g++.h
+++ b/ace/config-psosim-g++.h
@@ -47,6 +47,9 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+#endif /* __GNUG__ */
 
 #define ACE_HAS_IP_MULTICAST
 
@@ -89,7 +92,7 @@
 
 #if !defined (ACE_MT_SAFE)
 # define ACE_MT_SAFE 1
-#endif                      
+#endif
 
 #define ACE_DEFAULT_THREAD_KEYS 256
 
@@ -100,7 +103,7 @@
 
 */
 
-#define ACE_HAS_TSS_EMULATION 
+#define ACE_HAS_TSS_EMULATION
 
 
 ////////////////////////////////////////////////////////////////
@@ -214,16 +217,6 @@
 
 #define ACE_PAGE_SIZE 4096
 
-#define ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 194b3d2f79e..0a6d59d7d9a 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -7,6 +7,13 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
 // Compiling for SCO.
 #if !defined (SCO)
 #define SCO
@@ -25,10 +32,6 @@
 #endif /* SCO */
 
 #define ACE_HAS_SIG_MACROS
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 #define ACE_LACKS_SYSCALL
 #define ACE_LACKS_STRRECVFD
@@ -44,11 +47,8 @@
 #define ACE_LACKS_RECVMSG
 #define ACE_LACKS_SENDMSG
 
-// Compiler doesn't support static data member templates.
-//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
+#define ACE_HAS_SYSV_IPC
 
 // Platform supports recvmsg and sendmsg.
 //#define ACE_HAS_MSG
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index bfb2bec888e..73052e4a5d9 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -1,3 +1,6 @@
+/* -*- C++ -*- */
+// $Id$
+
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index 32e2fbd5b0d..d6f2dd8f94a 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -1,3 +1,6 @@
+/* -*- C++ -*- */
+// $Id$
+
 // The following configuration file is designed to work for SCO UNIX
 // version 5.0 with MIT pthreads.
 
@@ -8,10 +11,17 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+#if defined (__GNUG__)
+# include "ace/config-g++-common.h"
+  // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
+  // Maybe it will work?
+# undef ACE_HAS_TEMPLATE_SPECIALIZATION
+#endif /* __GNUG__ */
+
 // Compiling for SCO.
 #if !defined (SCO)
 #define SCO
-#define	_SVID3
+#define _SVID3
 #endif /* SCO */
 
 #define ACE_DEFAULT_CLOSE_ALL_HANDLES 0
@@ -24,10 +34,7 @@
 #endif /* SCO */
 
 #define ACE_LACKS_PWD_FUNCTIONS
-#define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_HAS_LONG_FDMASK
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 
 //#define ACE_LACKS_SYSCALL
 //#define ACE_LACKS_STRRECVFD
@@ -37,14 +44,11 @@
 
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
-// Compiler doesn't support static data member templates.
-//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-#define	ACE_HAS_NONCONST_MSGSND
-// #define	ACE_LACKS_POSIX_PROTOTYPES
-#define	ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_NONCONST_MSGSND
+// #define      ACE_LACKS_POSIX_PROTOTYPES
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 
 // Platform supports Term Ioctls
@@ -89,7 +93,7 @@
 
 // ???
 // #define ACE_HAS_SUNOS4_GETTIMEOFDAY
-#define	ACE_HAS_TIMEZONE_GETTIMEOFDAY
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // HP/UX has an undefined syscall for GETRUSAGE...
 //#define ACE_HAS_SYSCALL_GETRUSAGE
@@ -102,12 +106,12 @@
 
 // Platform has prototypes for ACE_TLI.
 #define ACE_HAS_TLI
-//#define	ACE_HAS_SVR4_TLI
+//#define       ACE_HAS_SVR4_TLI
 #define ACE_HAS_T_OPMGMT
 #define ACE_HAS_TLI_PROTOTYPES
-#define	ACE_HAS_TIMOD_H
-#define	ACE_HAS_TIUSER_H
-#define	ACE_LACKS_T_ERRNO
+#define ACE_HAS_TIMOD_H
+#define ACE_HAS_TIUSER_H
+#define ACE_LACKS_T_ERRNO
 
 // Platform has the XLI version of ACE_TLI.
 // #define ACE_HAS_XLI
@@ -120,43 +124,43 @@
 #endif /* ACE_NTRACE */
 
 #define ACE_HAS_SIGINFO_T
-#define	ACE_HAS_UCONTEXT_T
+#define ACE_HAS_UCONTEXT_T
 
-#define	ACE_NEEDS_SYSTIME_H
+#define ACE_NEEDS_SYSTIME_H
 #define ACE_HAS_INLINED_OSCALLS
 
-#define	ACE_HAS_STRBUF_T
-#define	ACE_HAS_STREAMS
-//#define	ACE_HAS_STREAM_PIPES
-#define	ACE_HAS_IP_MULTICAST
+#define ACE_HAS_STRBUF_T
+#define ACE_HAS_STREAMS
+//#define       ACE_HAS_STREAM_PIPES
+#define ACE_HAS_IP_MULTICAST
 
 // Threads
-#define	ACE_HAS_THREADS
+#define ACE_HAS_THREADS
 #if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
 #endif
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define	ACE_HAS_PTHREADS
-#define	ACE_HAS_PTHREAD_T
-#define	ACE_LACKS_PTHREAD_CANCEL
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREAD_T
+#define ACE_LACKS_PTHREAD_CANCEL
 #define ACE_HAS_PTHREAD_SIGMASK
-#define	ACE_HAS_SIGWAIT
-//#define	ACE_HAS_ONEARG_SIGWAIT
-//#define	ACE_HAS_PTHREAD_YIELD_VOID_PTR
-//#define	ACE_HAS_YIELD_VOID_PTR
-//#define	ACE_HAS_PTHREAD_ATTR_INIT
-//#define	ACE_HAS_PTHREAD_ATTR_DESTROY
-//#define	ACE_HAS_PTHREAD_DSTATE_PTR
-//#define	ACE_HAS_PTHREAD_EQUAL
-//#define	ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR
+#define ACE_HAS_SIGWAIT
+//#define       ACE_HAS_ONEARG_SIGWAIT
+//#define       ACE_HAS_PTHREAD_YIELD_VOID_PTR
+//#define       ACE_HAS_YIELD_VOID_PTR
+//#define       ACE_HAS_PTHREAD_ATTR_INIT
+//#define       ACE_HAS_PTHREAD_ATTR_DESTROY
+//#define       ACE_HAS_PTHREAD_DSTATE_PTR
+//#define       ACE_HAS_PTHREAD_EQUAL
+//#define       ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 //#define ACE_LACKS_THREAD_STACK_ADDR
 //#define ACE_LACKS_KEYDELETE
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_RWLOCK_T
-#define	ACE_LACKS_SETSCHED
+#define ACE_LACKS_SETSCHED
 #define ACE_LACKS_RPC_H
-#define	ACE_HAS_POSIX_TIME
+#define ACE_HAS_POSIX_TIME
 
 #include <pthread.h>
 #include <sys/regset.h>