added ACE_HAS_INSTANTIATION_PRAGMA support

2 files changed, 24 insertions, 16 deletions

diff --git a/performance-tests/Synch-Benchmarks/Benchmark.cpp b/performance-tests/Synch-Benchmarks/Benchmark.cpp
index e95cf180bd0..a0558e9b2c3 100644
--- a/performance-tests/Synch-Benchmarks/Benchmark.cpp
+++ b/performance-tests/Synch-Benchmarks/Benchmark.cpp
@@ -9,13 +9,13 @@
 ACE_Svc_Export int synch_count;
 int buffer;
 
-// Initialize the static variables. 
+// Initialize the static variables.
 /* static */
 sig_atomic_t Benchmark::done_ = 0;
 
 sig_atomic_t
 Benchmark::done (void)
-{ 
+{
   return Benchmark::done_;
 }
 
@@ -32,8 +32,8 @@ Benchmark::thr_id (void)
 
 void
 Benchmark::done (sig_atomic_t d)
-{ 
-  Benchmark::done_ = d; 
+{
+  Benchmark::done_ = d;
 }
 
 int
@@ -88,8 +88,11 @@ Thr_ID::thr_id (int i)
   this->thr_id_ = i;
 }
 
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_TSS<Thr_ID>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_TSS<Thr_ID>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_PTHREADS || ACE_HAS_DCETHREADS || VXWORKS */
 #endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Options.cpp b/performance-tests/Synch-Benchmarks/Options.cpp
index 9abbd4d48f8..07baea92b1e 100644
--- a/performance-tests/Synch-Benchmarks/Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Options.cpp
@@ -179,7 +179,7 @@ Options::parse_args (int argc, char *argv[])
 		   "\t[-B] (THR_BOUND)\n"
 		   "\t[-c] + number of logical connections\n"
 		   "\t[-c] - number of physical connections\n"
-		   "\t[-C] (enable checksumming)\n"		      
+		   "\t[-C] (enable checksumming)\n"
 		   "\t[-d] (enable debugging)\n"
 		   "\t[-D] (THR_DETACHED)\n"
 		   "\t[-e] (eager exit)\n"
@@ -189,9 +189,9 @@ Options::parse_args (int argc, char *argv[])
 		   "\t[-i] number of test iterations [%d]\n"
 		   "\t[-L] low water mark\n"
 		   "\t[-m] mapped file\n"
-		   "\t[-M] message size\n" 
-		   "\t[-n] number of LWPs\n" 		      
-		   "\t[-N] (THR_NEW_LWP)\n" 
+		   "\t[-M] message size\n"
+		   "\t[-n] number of LWPs\n"
+		   "\t[-N] (THR_NEW_LWP)\n"
 		   "\t[-p] (print benchmark summary)\n"
 		   "\t[-P] number of consecutive ports\n"
 		   "\t[-s] sleep time\n"
@@ -246,7 +246,7 @@ Options::parse_args (int argc, char *argv[])
 		  "%8d = free dynamic memory\n"
 		  "%8d = print summary only\n"
 		  "%8d = eager exit\n"
-		  "%8d = UDP\n"		  
+		  "%8d = UDP\n"
 		  "%8d = send ack\n"
 		  "%8d = THR_DETACHED\n"
 		  "%8d = THR_BOUND\n"
@@ -307,8 +307,8 @@ Options::print_results (void)
 		    "%8.2f Mbit/sec\n"
 		    "%8d (voluntary context switches)\n"
 		    "%8d (involuntary context switches)\n"
-		    "%8d (total context switches)\n"		    
-		    "%8d.%d sec (wait-cpu time)\n"		
+		    "%8d (total context switches)\n"
+		    "%8d.%d sec (wait-cpu time)\n"
 		    "%8d.%d sec (user lock wait sleep time)\n"
 		    "%8d.%d sec (all other sleep time)\n"
 		    "%8d (major page faults)\n"
@@ -351,7 +351,7 @@ Options::print_results (void)
 		    "%8d = messages sent\n"
 		    "%8d = messages received\n"
 		    "%8d = signals received\n"
-		    "%8ds, %dms = wait-cpu (latency) time\n"		
+		    "%8ds, %dms = wait-cpu (latency) time\n"
 		    "%8ds, %dms = user lock wait sleep time\n"
 		    "%8ds, %dms = all other sleep time\n"
 		    "%8d = voluntary context switches\n"
@@ -394,9 +394,14 @@ Options::print_results (void)
 #endif /* ACE_HAS_THREADS */
 
 
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 template class ACE_Atomic_Op<ACE_Thread_Mutex, size_t>;
 #endif /* ACE_MT_SAFE */
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, size_t>
+#endif /* ACE_MT_SAFE */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+