ChangeLogTag:Mon May 8 12:30:15 2000 Nanbor Wang <nanbor@cs.wustl.edu>

4 files changed, 31 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index efa20ad8ab0..1e5a73904d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May  8 12:30:15 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* include/makeinclude/platform_sunos5_kcc.GNU: Added
+	  "--once_instantiation_per_object" flag for both compiler and
+	  linker to avoid some warnings about duplicate symbol
+	  definitions.
+
 Sun May  7 19:50:21 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * include/makeinclude/platform_sunos5_sunc++.GNU:
@@ -11,12 +18,12 @@ Sat May  6 17:49:01 2000  Darrell Brunsch <brunsch@uci.edu>
         * ace/Log_Msg.cpp:
 
           Changed the signature of log_priority_enabled to have both the
-          char * and wchar_t * versions when using ACE_USES_WCHAR.  The 
+          char * and wchar_t * versions when using ACE_USES_WCHAR.  The
           reason why this has to be done is because of ACE_HEX_DUMP.
 
           ACE_HEX_DUMP calls both log_priority_enabled and log_hexdump,
           and it doesn't make sense to change the signature of log_hexdump.
-          If it were to take in a wchar_t buffer, it should print the 
+          If it were to take in a wchar_t buffer, it should print the
           entire wchar_t.  But if we have a buffer that is a char *, then
           it doesn't make sense to convert it to a wchar_t * buffer, since
           it adds all those extra bytes that would show up with hexdump.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index efa20ad8ab0..1e5a73904d3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon May  8 12:30:15 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* include/makeinclude/platform_sunos5_kcc.GNU: Added
+	  "--once_instantiation_per_object" flag for both compiler and
+	  linker to avoid some warnings about duplicate symbol
+	  definitions.
+
 Sun May  7 19:50:21 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * include/makeinclude/platform_sunos5_sunc++.GNU:
@@ -11,12 +18,12 @@ Sat May  6 17:49:01 2000  Darrell Brunsch <brunsch@uci.edu>
         * ace/Log_Msg.cpp:
 
           Changed the signature of log_priority_enabled to have both the
-          char * and wchar_t * versions when using ACE_USES_WCHAR.  The 
+          char * and wchar_t * versions when using ACE_USES_WCHAR.  The
           reason why this has to be done is because of ACE_HEX_DUMP.
 
           ACE_HEX_DUMP calls both log_priority_enabled and log_hexdump,
           and it doesn't make sense to change the signature of log_hexdump.
-          If it were to take in a wchar_t buffer, it should print the 
+          If it were to take in a wchar_t buffer, it should print the
           entire wchar_t.  But if we have a buffer that is a char *, then
           it doesn't make sense to convert it to a wchar_t * buffer, since
           it adds all those extra bytes that would show up with hexdump.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index efa20ad8ab0..1e5a73904d3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Mon May  8 12:30:15 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* include/makeinclude/platform_sunos5_kcc.GNU: Added
+	  "--once_instantiation_per_object" flag for both compiler and
+	  linker to avoid some warnings about duplicate symbol
+	  definitions.
+
 Sun May  7 19:50:21 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * include/makeinclude/platform_sunos5_sunc++.GNU:
@@ -11,12 +18,12 @@ Sat May  6 17:49:01 2000  Darrell Brunsch <brunsch@uci.edu>
         * ace/Log_Msg.cpp:
 
           Changed the signature of log_priority_enabled to have both the
-          char * and wchar_t * versions when using ACE_USES_WCHAR.  The 
+          char * and wchar_t * versions when using ACE_USES_WCHAR.  The
           reason why this has to be done is because of ACE_HEX_DUMP.
 
           ACE_HEX_DUMP calls both log_priority_enabled and log_hexdump,
           and it doesn't make sense to change the signature of log_hexdump.
-          If it were to take in a wchar_t buffer, it should print the 
+          If it were to take in a wchar_t buffer, it should print the
           entire wchar_t.  But if we have a buffer that is a char *, then
           it doesn't make sense to convert it to a wchar_t * buffer, since
           it adds all those extra bytes that would show up with hexdump.
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
index 4993a039134..f70a81cc93f 100644
--- a/include/makeinclude/platform_sunos5_kcc.GNU
+++ b/include/makeinclude/platform_sunos5_kcc.GNU
@@ -8,6 +8,10 @@ distrib = 0
 threads = 1
 exceptions = 1
 
+# These are required for KCC 3.4g compiler.
+LDFLAGS += --one_instantiation_per_object
+CCFLAGS += --one_instantiation_per_object
+
 ifeq ($(threads),1)
   CFLAGS += --thread_safe
   LDFLAGS += --thread_safe