Reorganized template codes for Base_Optimizer.

4 files changed, 35 insertions, 25 deletions

diff --git a/netsvcs/lib/Base_Optimizer.cpp b/netsvcs/lib/Base_Optimizer.cpp
index 1e6393c9151..7fb0b519bfd 100644
--- a/netsvcs/lib/Base_Optimizer.cpp
+++ b/netsvcs/lib/Base_Optimizer.cpp
@@ -4,6 +4,22 @@
 
 #include "Base_Optimizer.h"
 
-#if !defined (__ACE_INLINE__)
-# include "Base_Optimizer.i"
-#endif /* __ACE_INLINE__ */
+template<class Base, class Member> ACE_INLINE
+Base_Optimizer<Base, Member>::Base_Optimizer (void)
+{
+}
+
+template<class Base, class Member> ACE_INLINE
+Base_Optimizer<Base, Member>::Base_Optimizer (const Base &base,
+                                              const Member &member)
+  : Base (base),
+    m_ (member)
+{
+}
+
+template<class Base, class Member> ACE_INLINE
+Base_Optimizer<Base, Member>::Base_Optimizer (const Base &base)
+  : Base (base)
+{
+}
+
diff --git a/netsvcs/lib/Base_Optimizer.h b/netsvcs/lib/Base_Optimizer.h
index 41f8b7f6c5f..86a174c0fce 100644
--- a/netsvcs/lib/Base_Optimizer.h
+++ b/netsvcs/lib/Base_Optimizer.h
@@ -33,4 +33,12 @@ struct Base_Optimizer : public Base
   Member m_;
 };
 
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Base_Optimizer.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Base_Optimizer.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
 #endif /* BASE_OPTIMIZER_H */
diff --git a/netsvcs/lib/Base_Optimizer.i b/netsvcs/lib/Base_Optimizer.i
deleted file mode 100644
index eba6c3b3128..00000000000
--- a/netsvcs/lib/Base_Optimizer.i
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-template<class Base, class Member> ACE_INLINE
-Base_Optimizer<Base, Member>::Base_Optimizer (void)
-{
-}
-
-template<class Base, class Member> ACE_INLINE
-Base_Optimizer<Base, Member>::Base_Optimizer (const Base &base,
-                                              const Member &member)
-  : Base (base),
-    m_ (member)
-{
-}
-
-template<class Base, class Member> ACE_INLINE
-Base_Optimizer<Base, Member>::Base_Optimizer (const Base &base)
-  : Base (base)
-{
-}
-
diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp
index 7f873fea877..c1e618778df 100644
--- a/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/netsvcs/lib/Server_Logging_Handler.cpp
@@ -16,6 +16,10 @@ ACE_SVC_FACTORY_DEFINE (ACE_Server_Logging_Acceptor)
 ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
+  template class Base_Optimizer<LOG_MESSAGE_RECEIVER, ACE_CString>;
+  template class Base_Optimizer<LOG_MESSAGE_RECEIVER, SCHEDULE_STRATEGY>;
+#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
 template class Log_Message_Receiver_Impl<ACE_NULL_SYNCH>;
 template class Static_Log_Message_Receiver<ACE_NULL_SYNCH>;
 template class ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>;
@@ -110,6 +114,10 @@ template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>;
   // here.
   #endif /* ACE_HAS_TLI */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES) && !defined (__GNUG__)
+  #pragma instantiate Base_Optimizer<LOG_MESSAGE_RECEIVER, ACE_CString>
+  #pragma instantiate Base_Optimizer<LOG_MESSAGE_RECEIVER, SCHEDULE_STRATEGY>
+#endif /* ! (ACE_HAS_BROKEN_HPUX_TEMPLATES) && ! (__GNUG__) */
 #pragma instantiate Log_Message_Receiver_Impl<ACE_NULL_SYNCH>
 #pragma instantiate Static_Log_Message_Receiver<ACE_NULL_SYNCH>
 #pragma instantiate ACE_Acceptor<Null_Synch_Logging_Handler_Static_Receiver, LOGGING_PEER_ACCEPTOR>