ChangeLogTag:Sat Aug 9 20:55:47 UTC 2003 Don Hinton <dhinton@dresystems.com>

10 files changed, 45 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ca7853db2a..e0513bbd01b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Sat Aug  9 20:55:47 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * examples/Connection/blocking/SPIPE-acceptor.cpp:
+        * examples/Export/dll.cpp:
+          Added missing explicit template instantiations.
+
+        * examples/examples/OS/Process/imore.cpp:
+        * examples/Connection/blocking/SPIPE-connector.cpp:
+        * examples/OS/Process/process.cpp:
+        * examples/Reactor/Proactor/test_proactor.cpp:
+
+        * examples/Timer_Queue/Thread_Timer_Queue_Test.cpp:
+          Added #include Condition_T.h and Thread_Mutex.h needed for
+          explicit template instantiation.
+
+        * examples/Timer_Queue/Timer_Queue.mpc:
+          Added "after" directive so library gets compiled first.
+
+        * tests/Collection_Test.cpp:
+          Fixed a typo in an explicit template instantiation directive.
+
 Sat Aug  9 13:56:37 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 	* Kokyu/Dispatcher_Task.h: Deleted extra qualification for method
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index b2e97b55ea3..d2a1a6f7417 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -223,9 +223,11 @@ IPC_Server::svc (void)
 #endif /* SPIPE_ACCEPTOR_C */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Concurrency_Strategy<Svc_Handler>;
 template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>
 #pragma instantiate ACE_Concurrency_Strategy<Svc_Handler>
 #pragma instantiate ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index 3303aca95b6..5f14bcd1c96 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -45,7 +45,7 @@ Peer_Handler::open (void *)
     }
   else // If iterations_ has been set, send iterations_ buffers.
     {
-      char *buffer =
+      const char *buffer =
         "Oh give me a home\n"
         "Where the buffalo roam,\n"
         "And the deer and the antelope play.\n"
diff --git a/examples/Export/dll.cpp b/examples/Export/dll.cpp
index bef2877c058..696b46b9c10 100644
--- a/examples/Export/dll.cpp
+++ b/examples/Export/dll.cpp
@@ -19,3 +19,9 @@ get_dll_singleton ()
 {
   return TEST_SINGLETON::instance ();
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template classACE_Singleton<test_class,ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<test_class,ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/OS/Process/imore.cpp b/examples/OS/Process/imore.cpp
index a7b1d06cb66..e6470e8e777 100644
--- a/examples/OS/Process/imore.cpp
+++ b/examples/OS/Process/imore.cpp
@@ -34,12 +34,12 @@ ACE_RCSID(Process, imore, "$Id$")
 
 #if defined (ACE_WIN32)
 static const char * executable = "MORE.COM";
-static char *rendezvous_dir = "c:/temp";
-static char *rendezvous_pfx = "imore";
+static const char *rendezvous_dir = "c:/temp";
+static const char *rendezvous_pfx = "imore";
 #else
 static const char * executable = "more"; // I like less better.
-static char *rendezvous_dir = "/tmp";
-static char *rendezvous_pfx = "imore";
+static const char *rendezvous_dir = "/tmp";
+static const char *rendezvous_pfx = "imore";
 #endif /* ACE_WIN32 */
 
 static char *fname = 0;		// File you want to view.
diff --git a/examples/OS/Process/process.cpp b/examples/OS/Process/process.cpp
index 8acdc3a579c..e68c4456604 100644
--- a/examples/OS/Process/process.cpp
+++ b/examples/OS/Process/process.cpp
@@ -36,7 +36,7 @@ const char *LS_PATH = "ls";
 const char *SLEEP_PATH = "sleep";
 #endif /* ACE_WIN32 */
 
-static char *executable = EXEC_NAME;
+static const char *executable = EXEC_NAME;
 static char *print_file = 0;
 static char *environment_string = 0;
 static int get_env = 0;
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 128ab2f06c0..19edc070eee 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -44,10 +44,10 @@ static ACE_TCHAR *host = 0;
 static u_short port = ACE_DEFAULT_SERVER_PORT;
 
 // File that we're sending.
-static ACE_TCHAR *file = ACE_TEXT("test_proactor.cpp");
+static const ACE_TCHAR *file = ACE_TEXT("test_proactor.cpp");
 
 // Name of the output file.
-static ACE_TCHAR *dump_file = ACE_TEXT("output");
+static const ACE_TCHAR *dump_file = ACE_TEXT("output");
 
 // Keep track of when we're done.
 static int done = 0;
@@ -377,7 +377,7 @@ Sender::Sender (void)
     transmit_file_done_ (0)
 {
   // Moment of inspiration... :-)
-  static char *data = "Welcome to Irfan World! Irfan RULES here !!\n";
+  static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n";
   this->welcome_message_.init (data,
                                ACE_OS::strlen (data));
   this->welcome_message_.wr_ptr (ACE_OS::strlen (data));
diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
index 1071036f716..a47c8bb42c3 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp
@@ -24,6 +24,9 @@
 
 #include "Thread_Timer_Queue_Test.h"
 
+#include "ace/Condition_T.h"
+#include "ace/Thread_Mutex.h"
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Thread_Timer_Queue_Adapter<Timer_Heap>;
 template class Timer_Queue_Test_Driver<Thread_Timer_Queue,
diff --git a/examples/Timer_Queue/Timer_Queue.mpc b/examples/Timer_Queue/Timer_Queue.mpc
index 718cc75278a..f518d6ba6a7 100644
--- a/examples/Timer_Queue/Timer_Queue.mpc
+++ b/examples/Timer_Queue/Timer_Queue.mpc
@@ -13,6 +13,7 @@ project(*Async) : aceexe {
   exename = Asynch_Timer_Queue_Test
   after  += Timer_Queue_Library
   libs   += tqtd
+  after  += Timer_Queue_Library
   Source_Files {
     main_async.cpp
   }
@@ -22,6 +23,7 @@ project(*Reactor) : aceexe {
   exename = Reactor_Timer_Queue_Test
   after  += Timer_Queue_Library
   libs   += tqtd
+  after  += Timer_Queue_Library
   Source_Files {
     main_reactor.cpp
   }
@@ -31,6 +33,7 @@ project(*Thread) : aceexe {
   exename = Thread_Timer_Queue_Test
   after  += Timer_Queue_Library
   libs   += tqtd
+  after  += Timer_Queue_Library
   Source_Files {
     main_thread.cpp
   }
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index ab67862911f..7e89518ba77 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -187,7 +187,7 @@ template class ACE_Node<DATA>;
 #if (ACE_SIZEOF_INT != 4)
 // These might be already instantiated in ace/stats.cpp
 // (if ACE_INT32 == int)
-ptemplate class ACE_Node<DATA>;
+template class ACE_Node<DATA>;
 #endif /* ACE_SIZEOF_INT != 4 */
 
 template class ACE_Array<ARRAY_DATA>;