removed instantiations of ACE_Guard, etc., because ace/Filecache.cpp now instantiates them.

6 files changed, 0 insertions, 48 deletions

diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index 9f0913c291a..645c3c7c972 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -198,12 +198,4 @@ template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<Peer_Handler> *, ACE_S
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<Peer_Handler> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Tuple<Peer_Handler>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index 8ab1abf8a08..b4d6da1a07b 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -185,14 +185,6 @@ template class ACE_Strategy_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
 template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_NULL_SYNCH>;
 template class ACE_Svc_Tuple<Client_Service>;
 template class ACE_Thread_Strategy<Server_Service>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else
diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp
index 118f41c6c1f..7924a2a9a10 100644
--- a/examples/Connection/non_blocking/test_lsock_connector.cpp
+++ b/examples/Connection/non_blocking/test_lsock_connector.cpp
@@ -32,12 +32,4 @@ template class Peer_Handler<ACE_LSOCK_STREAM>;
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *>;
 template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_sock_connector.cpp b/examples/Connection/non_blocking/test_sock_connector.cpp
index a24dc274d7a..1d1f9c024be 100644
--- a/examples/Connection/non_blocking/test_sock_connector.cpp
+++ b/examples/Connection/non_blocking/test_sock_connector.cpp
@@ -32,12 +32,4 @@ template class Peer_Handler<ACE_SOCK_STREAM>;
 template class ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *>;
 template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_spipe_connector.cpp b/examples/Connection/non_blocking/test_spipe_connector.cpp
index 4f5e11d4456..b56011e234a 100644
--- a/examples/Connection/non_blocking/test_spipe_connector.cpp
+++ b/examples/Connection/non_blocking/test_spipe_connector.cpp
@@ -32,14 +32,6 @@ template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_S
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
 template class Peer_Handler<ACE_SPIPE_STREAM>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index ab3ee1a88db..7f1567582fd 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -34,14 +34,6 @@ template class ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_S
 template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>;
 template class IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR>;
 template class Peer_Handler<ACE_TLI_STREAM>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-  template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
-#else
-  // These are specialized in libACE if ACE doesn't have threads.
-#endif /* ACE_HAS_THREADS */
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #else