added ACE_HAS_INSTANTIATION_PRAGMA support

2 files changed, 52 insertions, 41 deletions

diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 6649af76424..ff57f51fa93 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -47,7 +47,7 @@ Options::parse_args (int argc, char *argv[])
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
-       case 'p': 
+       case 'p':
 	 this->port_ = ACE_OS::atoi (get_opt.optarg);
 	 break;
        default:
@@ -58,15 +58,15 @@ Options::parse_args (int argc, char *argv[])
 // ----------------------------------------
 
 // Our Reactor Singleton.
-typedef ACE_Singleton<ACE_Reactor, ACE_Null_Mutex> 
+typedef ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
 	REACTOR;
 
 // Our Options Singleton.
-typedef ACE_Singleton<Options, ACE_Null_Mutex> 
+typedef ACE_Singleton<Options, ACE_Null_Mutex>
 	OPTIONS;
 
 // Our ACE_Test_and_Set Singleton.
-typedef ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex> 
+typedef ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>
 	QUIT_HANDLER;
 
 // ----------------------------------------
@@ -74,7 +74,7 @@ typedef ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_
 class Logging_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
   // = TITLE
   //     Receive client message from the remote clients.
-  // 
+  //
   // = DESCRIPTION
   //     This class demonstrates how to receive messages from remote
   //     clients using the notification mechanisms in the
@@ -91,8 +91,8 @@ public:
 protected:
   // = Demultiplexing hooks.
   virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &tv, 
-			      const void *arg); 
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+			      const void *arg);
 
 private:
   char peer_name_[MAXHOSTNAMELEN + 1];
@@ -100,7 +100,7 @@ private:
 };
 
 // Specialize a Logging Acceptor.
-typedef ACE_Acceptor <Logging_Handler, ACE_SOCK_ACCEPTOR> 
+typedef ACE_Acceptor <Logging_Handler, ACE_SOCK_ACCEPTOR>
 	Logging_Acceptor;
 
 // Default constructor.
@@ -118,7 +118,7 @@ Logging_Handler::handle_timeout (const ACE_Time_Value &,
   return 0;
 }
 
-// Perform the logging record receive. 
+// Perform the logging record receive.
 
 int
 Logging_Handler::handle_input (ACE_HANDLE)
@@ -130,16 +130,16 @@ Logging_Handler::handle_input (ACE_HANDLE)
   // it as an exercise for the reader ;-).
 
   ssize_t len;
-  ssize_t n = this->peer ().recv ((void *) &len, sizeof len); 
+  ssize_t n = this->peer ().recv ((void *) &len, sizeof len);
 
   switch (n)
     {
     case -1:
       ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
-			"client logger", this->peer_name_), -1);      
+			"client logger", this->peer_name_), -1);
       /* NOTREACHED */
     case 0:
-      ACE_ERROR_RETURN ((LM_ERROR, 
+      ACE_ERROR_RETURN ((LM_ERROR,
 			 "(%P|%t) closing log daemon at host %s (fd = %d)\n",
 			this->peer_name_, this->get_handle ()), -1);
       /* NOTREACHED */
@@ -154,7 +154,7 @@ Logging_Handler::handle_input (ACE_HANDLE)
 	  ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p at host %s\n",
 			    "client logger", this->peer_name_), -1);
 	/* NOTREACHED */
-	  
+
 	lp.decode ();
 
 	if (lp.length () == n)
@@ -180,28 +180,28 @@ int
 Logging_Handler::open (void *)
 {
   ACE_INET_Addr addr;
-  
+
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
   else
     {
-      ACE_OS::strncpy (this->peer_name_, 
-		       addr.get_host_name (), 
+      ACE_OS::strncpy (this->peer_name_,
+		       addr.get_host_name (),
 		       MAXHOSTNAMELEN + 1);
 
-      if (REACTOR::instance ()->register_handler 
+      if (REACTOR::instance ()->register_handler
 	  (this, ACE_Event_Handler::READ_MASK) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, 
+	ACE_ERROR_RETURN ((LM_ERROR,
 			   "(%P|%t) can't register with reactor\n"), -1);
       else if (REACTOR::instance ()->schedule_timer
-	       (this, 
-		(const void *) this, 
-		ACE_Time_Value (2), 
+	       (this,
+		(const void *) this,
+		ACE_Time_Value (2),
 		ACE_Time_Value (2)) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, 
+	ACE_ERROR_RETURN ((LM_ERROR,
 			   "can'(%P|%t) t register with reactor\n"), -1);
       else
-      	ACE_DEBUG ((LM_DEBUG, 
+      	ACE_DEBUG ((LM_DEBUG,
 		    "(%P|%t) connected with %s\n", this->peer_name_));
       return 0;
     }
@@ -218,44 +218,52 @@ main (int argc, char *argv[])
   // We need to pass in REACTOR::instance () here so that we don't use
   // the default ACE_Reactor::instance ().
 
-  if (peer_acceptor.open 
+  if (peer_acceptor.open
       (ACE_INET_Addr (OPTIONS::instance ()->port ()),
        REACTOR::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
 
-  else if (REACTOR::instance ()->register_handler 
+  else if (REACTOR::instance ()->register_handler
 	   (&peer_acceptor, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
 		       "registering service with ACE_Reactor\n"), -1);
 
   // Register QUIT_HANDLER to receive SIGINT commands.  When received,
   // QUIT_HANDLER becomes "set" and thus, the event loop below will
   // exit.
-  else if (REACTOR::instance ()->register_handler 
+  else if (REACTOR::instance ()->register_handler
 	   (SIGINT, QUIT_HANDLER::instance ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
 		       "registering service with ACE_Reactor\n"), -1);
 
   // Run forever, performing logging service.
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "(%P|%t) starting up server logging daemon\n"));
 
   // Perform logging service until QUIT_HANDLER receives SIGINT.
   while (QUIT_HANDLER::instance ()->is_set () == 0)
     REACTOR::instance ()->handle_events ();
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "(%P|%t) shutting down server logging daemon\n"));
 
   return 0;
 }
 
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Acceptor<Logging_Handler, ACE_SOCK_ACCEPTOR>;
 template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
 template class ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>;
 template class ACE_Singleton<Options, ACE_Null_Mutex>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Acceptor<Logging_Handler, ACE_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
+#pragma instantiate ACE_Singleton<ACE_Test_and_Set <ACE_Null_Mutex, sig_atomic_t>, ACE_Null_Mutex>
+#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>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp
index 7846c4ed249..eb223750af0 100644
--- a/examples/Logger/simple-server/server_loggerd.cpp
+++ b/examples/Logger/simple-server/server_loggerd.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
-       case 'p': 
+       case 'p':
 	 addr.set (ACE_OS::atoi (get_opt.optarg));
 	 break;
        default:
@@ -47,28 +47,31 @@ main (int argc, char *argv[])
 
   if (peer_acceptor.open (addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (REACTOR::instance ()->register_handler 
-	   (&peer_acceptor, 
+  else if (REACTOR::instance ()->register_handler
+	   (&peer_acceptor,
 	    ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-		       "registering service with ACE_Reactor\n"), 
+    ACE_ERROR_RETURN ((LM_ERROR,
+		       "registering service with ACE_Reactor\n"),
 		       -1);
 
   // Run forever, performing logging service.
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "(%P|%t) starting up server logging daemon\n"));
 
   while (!finished)
      REACTOR::instance ()->handle_events ();
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
 	      "(%P|%t) shutting down server logging daemon\n"));
 
   return 0;
 }
 
 
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<ACE_Reactor, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+