summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-16 21:19:13 +0000
committerfhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-05-16 21:19:13 +0000
commit1ae7a5c065293313631397965aa8640b8680897b (patch)
tree90476bec551c4627fbbb0a7a0b9f87de65de77f7
parentd52b00a99792fd0bed4f878cc9631a03cf9bb4e6 (diff)
downloadATCD-1ae7a5c065293313631397965aa8640b8680897b.tar.gz
ChangeLogTag: Wed May 16 16:15:24 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp8
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1129d584026..ac64829b829 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Wed May 16 16:15:24 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
+
+ * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp:
+ Commented out template instantiation of
+ ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> since
+ it is already instantiated in IIOP_Connection_Handler.cpp.
+ This should clean up the warnings in the Lynx_I386 builds.
+
Wed May 16 15:48:29 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
* tao/Strategies/SHMIOP_Acceptor.cpp:
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
index 1fd0b24f564..36094a4a2b1 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
@@ -380,13 +380,17 @@ TAO_DIOP_Connection_Handler::handle_cleanup (void)
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+// Instantiated in IIOP_Connection_Handler.cpp
+//template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
+
template class ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>;
template class ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>;
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+// Instantiated in IIOP_Connection_Handler.cpp
+//#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+
#pragma instantiate ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
#pragma instantiate ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>