ChangeLogTag:Mon Dec 30 21:30:41 2002 Steve Huston <shuston@riverace.com>

17 files changed, 62 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index b7b25b28499..cc4c28999b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Mon Dec 30 21:30:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_hpux_gcc.GNU: Removed the SOVERSION=
+          line to allow versions libraries to be set up properly.
+
+        * ace/Based_Pointer_Repository.cpp:
+        * ace/Dynamic.cpp:
+        * ace/SString.cpp:
+        * tests/Framework_Component_DLL.cpp:
+        * tests/MEM_Stream_Test.cpp:
+        * tests/Process_Strategy_Test.cpp:
+        * tests/Timeprobe_Test.cpp:
+        * apps/drwho/File_Manager.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp:
+        * examples/Logger/Acceptor-server/server_loggerd.cpp:
+        * examples/Logger/simple-server/server_loggerd.cpp:
+        * examples/Threads/auto_event.cpp:
+        * examples/Threads/tss2.cpp:
+          Add __hpux to the conditions needed to instantiate
+          static template members. Also see
+          Sat Nov 23 18:12:37 2002  Steve Huston  <shuston@riverace.com>
+
 Mon Dec 30 19:32:18 2002  Steve Huston  <shuston@riverace.com>
 
         * tests/Codecs_Test.cpp: Add explicit template instantiation for
@@ -1268,7 +1291,7 @@ Tue Dec  3 20:47:39 2002  Steve Huston  <shuston@riverace.com>
         * tests/MEM_Stream_Test.cpp: Add explicit instantiation of
           ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>,
                         ACE_SYNCH_RECURSIVE_MUTEX>::singleton_.
-        * tests/Process_Strategy_TEst.cpp: Add explicit instantiation of
+        * tests/Process_Strategy_Test.cpp: Add explicit instantiation of
           ACE_Singleton<Options, ACE_Null_Mutex>::singleton_.
         * tests/Timeprobe_Test.cpp: Add explicit instantiation of
           ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b7b25b28499..cc4c28999b9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,26 @@
+Mon Dec 30 21:30:41 2002  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_hpux_gcc.GNU: Removed the SOVERSION=
+          line to allow versions libraries to be set up properly.
+
+        * ace/Based_Pointer_Repository.cpp:
+        * ace/Dynamic.cpp:
+        * ace/SString.cpp:
+        * tests/Framework_Component_DLL.cpp:
+        * tests/MEM_Stream_Test.cpp:
+        * tests/Process_Strategy_Test.cpp:
+        * tests/Timeprobe_Test.cpp:
+        * apps/drwho/File_Manager.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp:
+        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp:
+        * examples/Logger/Acceptor-server/server_loggerd.cpp:
+        * examples/Logger/simple-server/server_loggerd.cpp:
+        * examples/Threads/auto_event.cpp:
+        * examples/Threads/tss2.cpp:
+          Add __hpux to the conditions needed to instantiate
+          static template members. Also see
+          Sat Nov 23 18:12:37 2002  Steve Huston  <shuston@riverace.com>
+
 Mon Dec 30 19:32:18 2002  Steve Huston  <shuston@riverace.com>
 
         * tests/Codecs_Test.cpp: Add explicit template instantiation for
@@ -1268,7 +1291,7 @@ Tue Dec  3 20:47:39 2002  Steve Huston  <shuston@riverace.com>
         * tests/MEM_Stream_Test.cpp: Add explicit instantiation of
           ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>,
                         ACE_SYNCH_RECURSIVE_MUTEX>::singleton_.
-        * tests/Process_Strategy_TEst.cpp: Add explicit instantiation of
+        * tests/Process_Strategy_Test.cpp: Add explicit instantiation of
           ACE_Singleton<Options, ACE_Null_Mutex>::singleton_.
         * tests/Timeprobe_Test.cpp: Add explicit instantiation of
           ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_.
diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp
index bb12097f8b5..fa6c7e4c842 100644
--- a/ace/Based_Pointer_Repository.cpp
+++ b/ace/Based_Pointer_Repository.cpp
@@ -121,7 +121,7 @@ template class ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>;
 #pragma instantiate ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> *
   ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp
index 31e9976167a..9d6f1f9b670 100644
--- a/ace/Dynamic.cpp
+++ b/ace/Dynamic.cpp
@@ -36,7 +36,7 @@ ACE_Dynamic::instance (void)
     #pragma instantiate ACE_TSS<ACE_Dynamic>
 # endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
 
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> *
   ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>::singleton_;
 
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 1f75d03800a..2f3557f9974 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -546,7 +546,7 @@ template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,
 #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_String_Base<ACE_WSTRING_TYPE> &)
 #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_WSTRING_TYPE *)
 #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,ACE_String_Base<ACE_WSTRING_TYPE> &)
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template char ACE_String_Base<char>::NULL_String_;
 template ACE_WSTRING_TYPE ACE_String_Base<ACE_WSTRING_TYPE>::NULL_String_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 8892b7be9c3..bca426b824f 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -169,7 +169,7 @@ template class ACE_Singleton<File_Manager,ACE_Null_Mutex>;
 
 #pragma instantiate ACE_Singleton<File_Manager,ACE_Null_Mutex>
 
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 
 template ACE_Singleton<File_Manager, ACE_Null_Mutex> *
   ACE_Singleton<File_Manager, ACE_Null_Mutex>::singleton_;
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index fe6e0dbc906..ea1835908cb 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -420,7 +420,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index ff3c5d78531..9034292f638 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -581,7 +581,7 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX)|| defined (__hpux))
 template ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> *
   ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index da1591602f3..247aa5d1197 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -228,7 +228,7 @@ template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
 #pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
 template ACE_Singleton<Options, ACE_Null_Mutex> *
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index aaef80e5406..e2dd16a1f33 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
 template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> *
   ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp
index 30640e8791a..52e13d68ea4 100644
--- a/examples/Threads/auto_event.cpp
+++ b/examples/Threads/auto_event.cpp
@@ -106,7 +106,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
 template class ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex> *
   ACE_Singleton<ACE_Auto_Event, ACE_Thread_Mutex>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Threads/tss2.cpp b/examples/Threads/tss2.cpp
index b74b605b30a..58e3f5f5ece 100644
--- a/examples/Threads/tss2.cpp
+++ b/examples/Threads/tss2.cpp
@@ -193,7 +193,7 @@ template class ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_TSS<TSS_Data>
 #pragma instantiate ACE_TSS<TSS_Obj>
 #pragma instantiate ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 template ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX> *
   ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU
index 894797785c8..d96eec917df 100644
--- a/include/makeinclude/platform_hpux_gcc.GNU
+++ b/include/makeinclude/platform_hpux_gcc.GNU
@@ -70,9 +70,7 @@ RANLIB		= echo
 LDFLAGS		= -L. -L$(ACE_ROOT)/ace -Wl,+s
 SOFLAGS		+= $(CPPFLAGS) -shared -nostdlib $(PIC)
 SOEXT		= sl
-SOVERSION	=
 SOBUILD 	= $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.$(SOEXT) $<
-#SHLIBBUILD 	= $(SOLINK.cc) -o $@ $(VSHOBJS1)
 PRELIB = @true
 #
 # Grab the appropriate libraries based on the version of HP-UX we're building
diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp
index bad0f3aeddb..47999a2da62 100644
--- a/tests/Framework_Component_DLL.cpp
+++ b/tests/Framework_Component_DLL.cpp
@@ -80,7 +80,7 @@ template class ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_
                                          ACE_SYNCH_MUTEX >
 #pragma instantiate ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T<Simple_Service>,
                                                ACE_SYNCH_MUTEX> >;
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 
 template ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T <Simple_Service>,
                              ACE_SYNCH_MUTEX> *
diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp
index 1d9bc4bb572..17990e18771 100644
--- a/tests/MEM_Stream_Test.cpp
+++ b/tests/MEM_Stream_Test.cpp
@@ -518,7 +518,7 @@ template class ACE_Thread_Strategy<Echo_Handler>;
 #  if defined (ACE_HAS_THREADS)
 #pragma instantiate ACE_Thread_Strategy<Echo_Handler>
 #  endif /* ACE_HAS_THREADS */
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 
 template ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>,
                        ACE_SYNCH_RECURSIVE_MUTEX> *
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index b1b4d1d382d..6501f2a5708 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -82,7 +82,7 @@ template class ACE_Write_Guard<ACE_File_Lock>;
 #pragma instantiate ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Write_Guard<ACE_File_Lock>
-#elif defined (__GNUC__) && defined (_AIX)
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
 
 template ACE_Singleton<Options, ACE_Null_Mutex> *
   ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index d27ada3b77f..a6b38405cd2 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -122,7 +122,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
     template class ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>;
 # elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #   pragma instantiate ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>
-# elif defined (__GNUC__) && defined (_AIX)
+# elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux))
     template ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> *
       ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_;
 # endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */