ChangeLogTag: Sun Aug 29 21:35:17 1999 David L. Levine <levine@cs.wustl.edu>

14 files changed, 68 insertions, 20 deletions

diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 2b65f4ac411..cdffb360ce8 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -36,8 +36,11 @@
 #  endif /* __IBMCPP__ */
 
 #elif defined (__GNUG__)
-# include "ace/config-g++-common.h"
+  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+  // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
+
+# include "ace/config-g++-common.h"
   // Denotes that GNU has cstring.h as standard, to redefine memchr().
 # define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_SSIZE_T
diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h
index b045ae5a566..923f8952b79 100644
--- a/ace/config-cygwin32-common.h
+++ b/ace/config-cygwin32-common.h
@@ -79,6 +79,10 @@
 
 // Then the compiler specific parts
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 #elif defined (__KCC)
@@ -115,8 +119,6 @@
 
 #define ACE_HAS_BIG_FD_SET
 
-#define ACE_HAS_STRING_CLASS
-
 // Linux defines struct msghdr in /usr/include/socket.h
 #define ACE_HAS_MSG
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 057f87845ff..d47be32b277 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -79,7 +79,15 @@
 # define ACE_LACKS_PRAGMA_ONCE
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#if defined (ACE_HAS_GNU_REPO)
+  // -frepo causes unresolved symbols of basic_string left- and
+  // right-shift operators with ACE_HAS_STRING_CLASS.
+# if defined (ACE_HAS_STRING_CLASS)
+#   undef ACE_HAS_STRING_CLASS
+# endif /* ACE_HAS_STRING_CLASS */
+#else  /* ! ACE_HAS_GNU_REPO */
+# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#endif /* ! ACE_HAS_GNU_REPO */
 #define ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
diff --git a/ace/config-hpux-10.x-g++.h b/ace/config-hpux-10.x-g++.h
index 166e2124551..06105880292 100644
--- a/ace/config-hpux-10.x-g++.h
+++ b/ace/config-hpux-10.x-g++.h
@@ -7,13 +7,16 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #include "ace/config-g++-common.h"
 
 // These are apparantly some things which are special to g++ on HP?  They are
 // compiler-related settings, but not in config-g++-common.h
 
 #define ACE_HAS_BROKEN_CONVERSIONS
-#define ACE_HAS_STRING_CLASS
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 #define _CLOCKID_T
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index c99ba376c7b..373335cdf03 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -7,6 +7,10 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #include "ace/config-g++-common.h"
 
 #define ACE_SIZEOF_LONG_DOUBLE 8
@@ -14,7 +18,6 @@
 #define ACE_LACKS_SYSTIME_H
 // Platform supports getpagesize() call.
 #define ACE_HAS_GETPAGESIZE
-#define ACE_HAS_STRING_CLASS
 #define IRIX5
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_DIRENT
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index 52415880e25..b86cf57cf74 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -7,8 +7,11 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#include "ace/config-g++-common.h"
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
 
+#include "ace/config-g++-common.h"
 
 // Platform supports the very odd IRIX 6.2 threads...
 #define ACE_HAS_THREADS
@@ -33,7 +36,6 @@
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
-#define ACE_HAS_STRING_CLASS
 #define IRIX6
 
 // Denotes that GNU has cstring.h as standard
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index cb3764738be..076ad628f93 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -84,6 +84,10 @@
 
 // Then the compiler specific parts
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 #elif defined (__KCC)
@@ -127,8 +131,6 @@
 
 #define ACE_HAS_BIG_FD_SET
 
-#define ACE_HAS_STRING_CLASS
-
 // Linux defines struct msghdr in /usr/include/socket.h
 #define ACE_HAS_MSG
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 6a9ed5f79c5..3bd869b8848 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -18,17 +18,23 @@
 #endif /* ! __ACE_INLINE__ */
 
 #if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-
 # if __GNUC_MINOR__ == 7
+
+#   include "ace/config-g++-common.h"
+
     // The g++ that's distributed with LynxOS 3.0.0 needs this.
     // It won't hurt with 2.5.0.
 #   undef ACE_HAS_TEMPLATE_SPECIALIZATION
 # elif __LYNXOS_SDK_VERSION <= 199603L
+    // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+    // this must appear before its #include.
+
     // If ACE_HAS_STRING_CLASS is used with LynxOS 3.0.0, some
     // executables, such as IOStream_Test, require linking with
     // libg++.
 #   define ACE_HAS_STRING_CLASS
+
+#   include "ace/config-g++-common.h"
 # endif /* __GNUC_MINOR__ == 7 */
 #endif /* __GNUG__ */
 
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index c81fa1cdb45..b8d720342bc 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -40,11 +40,16 @@
 #if defined (__GNUG__)
   // g++ with pthreads
 
+  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+  // this must appear before its #include.
+# define ACE_HAS_STRING_CLASS
+
 # include "ace/config-g++-common.h"
 
 # define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_REENTRANT_FUNCTIONS
 #elif defined (__DECCXX)
+# define ACE_HAS_STRING_CLASS
 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 # define ACE_LACKS_SIGNED_CHAR
@@ -94,6 +99,7 @@
 
 #elif defined (__rational__)
 # define ACE_HAS_REENTRANT_FUNCTIONS
+# define ACE_HAS_STRING_CLASS
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 # define ACE_LACKS_SIGNED_CHAR
 
@@ -104,6 +110,7 @@
 # define ACE_HAS_TYPENAME_KEYWORD
 # define ACE_HAS_USING_KEYWORD
 #elif defined (__KCC)
+# define ACE_HAS_STRING_CLASS
 # include "ace/config-kcc-common.h"
 #else
 # error unsupported compiler on Digital Unix
@@ -184,7 +191,6 @@
 #define ACE_HAS_STRBUF_T
 #define ACE_HAS_STREAMS
 #define ACE_HAS_STRERROR
-#define ACE_HAS_STRING_CLASS
 #define ACE_HAS_STRPTIME
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_SIGNAL_T
diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h
index 637bf170d1c..739e78174bc 100644
--- a/ace/config-sunos4-g++.h
+++ b/ace/config-sunos4-g++.h
@@ -10,6 +10,10 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #include "ace/config-g++-common.h"
 // This config file has not been tested with ACE_HAS_TEMPLATE_SPECIALIZATION.
 // Maybe it will work?
@@ -22,7 +26,6 @@
 
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-#define ACE_HAS_STRING_CLASS
 #define ACE_LACKS_SYSTIME_H
 #define ACE_LACKS_GETPGID
 
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index 54e7d32216c..f81535cec68 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -11,6 +11,10 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #include "ace/config-g++-common.h"
 #define ACE_HAS_GNU_CSTRING_H
 
@@ -21,8 +25,6 @@
 
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-#define ACE_HAS_STRING_CLASS
-
 // Platform supports pread() and pwrite()
 #define ACE_HAS_P_READ_WRITE
 
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 24a063fc64c..c8aaf432ec7 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -31,7 +31,7 @@
     // but the newer, explicit instantiation is used (above)
 #   if (__SUNPRO_CC_COMPAT >= 5)
 #     define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-// Note that SunC++ 5.0 doesn't yet appear to support 
+// Note that SunC++ 5.0 doesn't yet appear to support
 // ACE_HAS_STD_TEMPLATE_METHOD_SPECIALIZATION...
 #     define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #     define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
@@ -76,9 +76,11 @@
        from your CFLAGS, e.g., using make threads=0. */
 
 #elif defined (__GNUG__)
+  // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+  // this must appear before its #include.
+# define ACE_HAS_STRING_CLASS
 # include "ace/config-g++-common.h"
 # define ACE_HAS_HI_RES_TIMER
-# define ACE_HAS_STRING_CLASS
   // Denotes that GNU has cstring.h as standard, to redefine memchr().
 # define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_XPG4_MULTIBYTE_CHAR
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index d9e6ec1d64f..c82743a22cf 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -12,6 +12,10 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
@@ -20,7 +24,6 @@
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
 #define ACE_HAS_IDTYPE_T
-#define ACE_HAS_STRING_CLASS
 #define ACE_LACKS_STRCASECMP
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_AUTOMATIC_INIT_FINI
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index 12f8799e816..3802c6434aa 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -13,6 +13,10 @@
 # define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
+// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
+// this must appear before its #include.
+#define ACE_HAS_STRING_CLASS
+
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
@@ -27,7 +31,6 @@
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_GNU_CSTRING_H
-#define ACE_HAS_STRING_CLASS
 #define ACE_HAS_MSG
 #define ACE_HAS_SVR4_GETTIMEOFDAY
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R