ChangeLogTag:Mon Dec 2 20:09:29 2002 Steve Huston <shuston@riverace.com>

6 files changed, 40 insertions, 3 deletions

diff --git a/ACEXML/common/Mem_Map_Stream.cpp b/ACEXML/common/Mem_Map_Stream.cpp
index cb96b21bc0c..818bd11b230 100644
--- a/ACEXML/common/Mem_Map_Stream.cpp
+++ b/ACEXML/common/Mem_Map_Stream.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/FILE_Addr.h"
-#include "ace/Auto_Ptr.h"
 #include "ACEXML/common/Mem_Map_Stream.h"
 
 ACE_RCSID(common, Mem_Map_Stream, "$Id$")
@@ -243,13 +242,19 @@ ACEXML_Mem_Map_Stream::~ACEXML_Mem_Map_Stream (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Svc_Tuple<Svc_Handler>;
+template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>;
+template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Connector <Svc_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Svc_Tuple<Svc_Handler>
+#pragma instantiate ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *>
+#pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Iterator_Base<ACE_HANDLE, ACE_Svc_Tuple<Svc_Handler> *, ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/URL_Addr.cpp b/ACEXML/common/URL_Addr.cpp
index 08d5da0c376..3f06e15f7be 100644
--- a/ACEXML/common/URL_Addr.cpp
+++ b/ACEXML/common/URL_Addr.cpp
@@ -170,3 +170,9 @@ ACEXML_URL_Addr::~ACEXML_URL_Addr (void)
   ACE_OS::free (this->addr_string_);
   this->path_name_ = 0;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Array_Ptr<ACEXML_Char>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACEXML_Char>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ACEXML/common/XML_Codecs.cpp b/ACEXML/common/XML_Codecs.cpp
index 300ffdd5d4e..63230d8c6d7 100644
--- a/ACEXML/common/XML_Codecs.cpp
+++ b/ACEXML/common/XML_Codecs.cpp
@@ -89,3 +89,9 @@ ACEXML_Base64::decode (const ACEXML_Char* input,
 
   return result;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Array_Ptr<ACE_Byte>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_Byte>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ChangeLog b/ChangeLog
index d789584ddb5..cda2820c28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec  2 20:09:29 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv1/Reactive_Logging_Server_Ex.cpp:
+        * ACEXML/common/Mem_Map_Stream.cpp:
+        * ACEXML/common/URL_Addr.cpp:
+        * ACEXML/common/XML_Codecs.cpp: Added missing explicit template
+          instantiations to build clean on Sun Workshop 5.
+
 Mon Dec  2 19:41:27 2002  Steve Huston  <shuston@riverace.com>
 
         * tests/Proactor_Test.cpp: Rather than close connections outright
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index d789584ddb5..cda2820c28b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Mon Dec  2 20:09:29 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv1/Reactive_Logging_Server_Ex.cpp:
+        * ACEXML/common/Mem_Map_Stream.cpp:
+        * ACEXML/common/URL_Addr.cpp:
+        * ACEXML/common/XML_Codecs.cpp: Added missing explicit template
+          instantiations to build clean on Sun Workshop 5.
+
 Mon Dec  2 19:41:27 2002  Steve Huston  <shuston@riverace.com>
 
         * tests/Proactor_Test.cpp: Rather than close connections outright
diff --git a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
index 76ceaa1ea7d..c382402f5a4 100644
--- a/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
+++ b/examples/C++NPv1/Reactive_Logging_Server_Ex.cpp
@@ -34,9 +34,13 @@ template class ACE_Hash_Map_Entry<ACE_HANDLE, ACE_FILE_IO *>;
 template class ACE_Hash_Map_Manager<ACE_HANDLE, ACE_FILE_IO *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<ACE_HANDLE, ACE_FILE_IO *>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_HANDLE, ACE_FILE_IO *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_HANDLE, ACE_FILE_IO *, ACE_Hash<ACE_HANDLE>, ACE_Equal_To<ACE_HANDLE>, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */