*** empty log message ***

4 files changed, 56 insertions, 56 deletions

diff --git a/netsvcs/lib/Log_Message_Receiver.cpp b/netsvcs/lib/Log_Message_Receiver.cpp
index 9683460ead3..b4d1471165f 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -6,8 +6,8 @@
 #include "Log_Message_Receiver.h"
 
 // Type based log message receiver
-template<ACE_SYNCH_1> void
-Static_Log_Message_Receiver<ACE_SYNCH_2>::log_record (char const *hostname,
+template<ACE_SYNCH_DECL> void
+Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
 						      ACE_Log_Record &record)
 {
 #if defined (ACE_HAS_THREADS)
@@ -19,28 +19,28 @@ Static_Log_Message_Receiver<ACE_SYNCH_2>::log_record (char const *hostname,
 }
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-template<ACE_SYNCH_1> 
-ACE_SYNCH_MUTEX_T Log_Message_Receiver_Impl<ACE_SYNCH_2>::copy_lock_;
+template<ACE_SYNCH_DECL> 
+ACE_SYNCH_MUTEX_T Log_Message_Receiver_Impl<ACE_SYNCH_USE>::copy_lock_;
 #else
 static ACE_SYNCH_MUTEX global_copy_lock_;
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
-template<ACE_SYNCH_1> inline 
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::Log_Message_Receiver_Impl (void) 
+template<ACE_SYNCH_DECL> inline 
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::Log_Message_Receiver_Impl (void) 
   : count_ (0)
 {
 }
 
-template<ACE_SYNCH_1> inline
-Log_Message_Receiver_Impl<ACE_SYNCH_2> *
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::create (void)
+template<ACE_SYNCH_DECL> inline
+Log_Message_Receiver_Impl<ACE_SYNCH_USE> *
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::create (void)
 {
-  return new Log_Message_Receiver_Impl<ACE_SYNCH_2>;
+  return new Log_Message_Receiver_Impl<ACE_SYNCH_USE>;
 }
 
-template<ACE_SYNCH_1> inline
-Log_Message_Receiver_Impl<ACE_SYNCH_2> *
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::attach (Log_Message_Receiver_Impl<ACE_SYNCH_2> *body)
+template<ACE_SYNCH_DECL> inline
+Log_Message_Receiver_Impl<ACE_SYNCH_USE> *
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body)
 {
   ACE_ASSERT (body != 0);
 
@@ -56,8 +56,8 @@ Log_Message_Receiver_Impl<ACE_SYNCH_2>::attach (Log_Message_Receiver_Impl<ACE_SY
   return body;
 }
 
-template<ACE_SYNCH_1> inline void
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::detach(Log_Message_Receiver_Impl<ACE_SYNCH_2> *body)
+template<ACE_SYNCH_DECL> inline void
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach(Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body)
 {
   ACE_ASSERT (body != 0);
   
@@ -74,49 +74,49 @@ Log_Message_Receiver_Impl<ACE_SYNCH_2>::detach(Log_Message_Receiver_Impl<ACE_SYN
 }
 
 // Type based log message receiver
-template<ACE_SYNCH_1> inline void
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::log_record (char const *hostname,
+template<ACE_SYNCH_DECL> inline void
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (char const *hostname,
 						    ACE_Log_Record &record)
 {
   ACE_MT (Guard guard (print_lock_));
   record.print (hostname, 0, stderr);
 }
 
-template<ACE_SYNCH_1> inline 
-Log_Message_Receiver_Impl<ACE_SYNCH_2>::~Log_Message_Receiver_Impl (void)
+template<ACE_SYNCH_DECL> inline 
+Log_Message_Receiver_Impl<ACE_SYNCH_USE>::~Log_Message_Receiver_Impl (void)
 {
   ACE_ASSERT (count_ == 0 - 1);
 }
 
-template<ACE_SYNCH_1>
-Log_Message_Receiver<ACE_SYNCH_2>::Log_Message_Receiver (void) 
-  : receiver_impl_ (Log_Message_Receiver_Impl<ACE_SYNCH_2>::create ())
+template<ACE_SYNCH_DECL>
+Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver (void) 
+  : receiver_impl_ (Log_Message_Receiver_Impl<ACE_SYNCH_USE>::create ())
 {
   ACE_ASSERT (receiver_impl_ != 0);  
 }
 
-template<ACE_SYNCH_1>
-Log_Message_Receiver<ACE_SYNCH_2>::Log_Message_Receiver 
-  (Log_Message_Receiver<ACE_SYNCH_2> const &rhs)
-    : receiver_impl_ (Log_Message_Receiver_Impl<ACE_SYNCH_2>::attach (rhs.receiver_impl_))
+template<ACE_SYNCH_DECL>
+Log_Message_Receiver<ACE_SYNCH_USE>::Log_Message_Receiver 
+  (Log_Message_Receiver<ACE_SYNCH_USE> const &rhs)
+    : receiver_impl_ (Log_Message_Receiver_Impl<ACE_SYNCH_USE>::attach (rhs.receiver_impl_))
 {
   ACE_ASSERT (receiver_impl_ != 0);  
 }
 
 // Type based log message receiver
-template<ACE_SYNCH_1> void
-Log_Message_Receiver<ACE_SYNCH_2>::log_record(char const *hostname,
+template<ACE_SYNCH_DECL> void
+Log_Message_Receiver<ACE_SYNCH_USE>::log_record(char const *hostname,
                                               ACE_Log_Record &record)
 {
   ACE_ASSERT (receiver_impl_ != 0);  
   receiver_impl_->log_record (hostname, record);
 }
 
-template<ACE_SYNCH_1>
-Log_Message_Receiver<ACE_SYNCH_2>::~Log_Message_Receiver (void)
+template<ACE_SYNCH_DECL>
+Log_Message_Receiver<ACE_SYNCH_USE>::~Log_Message_Receiver (void)
 {
   ACE_ASSERT (receiver_impl_ != 0);  
-  Log_Message_Receiver_Impl<ACE_SYNCH_2>::detach (receiver_impl_);
+  Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (receiver_impl_);
 }
 
 #endif /* LOG_MESSAGE_RECEIVER_CPP */
diff --git a/netsvcs/lib/Log_Message_Receiver.h b/netsvcs/lib/Log_Message_Receiver.h
index 416337a4ae2..54c51107dac 100644
--- a/netsvcs/lib/Log_Message_Receiver.h
+++ b/netsvcs/lib/Log_Message_Receiver.h
@@ -79,7 +79,7 @@
 
 
 // Type based log message receiver
-template<ACE_SYNCH_1> 
+template<ACE_SYNCH_DECL> 
 class Static_Log_Message_Receiver
   // = TITLE
   //  Static_Log_Message_Receiver is a simple log message receiver. It
@@ -109,9 +109,9 @@ public:
 
 
 //Forward declaration
-template<ACE_SYNCH_1> class Log_Message_Receiver_Impl;
+template<ACE_SYNCH_DECL> class Log_Message_Receiver_Impl;
 
-template<ACE_SYNCH_1> 
+template<ACE_SYNCH_DECL> 
 class Log_Message_Receiver
   // = TITLE
   //  Log_Message_Receiver is a little more complicated log message receiver.
@@ -137,29 +137,29 @@ class Log_Message_Receiver
 public:
   Log_Message_Receiver (void);
   // Creates a new Log_Message_Receiver
-  Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_2> const &rhs);
+  Log_Message_Receiver(Log_Message_Receiver<ACE_SYNCH_USE> const &rhs);
   ~Log_Message_Receiver (void);
   
   void log_record (const char *hostname,
                    ACE_Log_Record &record);  
 private:
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const Log_Message_Receiver<ACE_SYNCH_2> &rhs))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const Log_Message_Receiver<ACE_SYNCH_USE> &rhs))
   
   // Attributes.
-  Log_Message_Receiver_Impl<ACE_SYNCH_2> *receiver_impl_;
+  Log_Message_Receiver_Impl<ACE_SYNCH_USE> *receiver_impl_;
 };
 
 // Implementation with reference count.
 
-template<ACE_SYNCH_1> 
+template<ACE_SYNCH_DECL> 
 class Log_Message_Receiver_Impl
 {
   friend class ACE_Shutup_GPlusPlus;  // Turn off g++ warning
 public:
   // Methods for handling reference count and instance lifetime
   static Log_Message_Receiver_Impl *create (void);
-  static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_2> *body);
-  static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_2> *body);
+  static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
+  static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body);
   
   void log_record (const char *hostname,
                    ACE_Log_Record &record);
@@ -178,8 +178,8 @@ private:
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   // = Not implemeted
-  ACE_UNIMPLEMENTED_FUNC (Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_2> &rhs))
-  ACE_UNIMPLEMENTED_FUNC (void operator=(const Log_Message_Receiver_Impl<ACE_SYNCH_2> &rhs))
+  ACE_UNIMPLEMENTED_FUNC (Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &rhs))
+  ACE_UNIMPLEMENTED_FUNC (void operator=(const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &rhs))
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index 8dd671b3c97..e9637d65744 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -11,12 +11,12 @@
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
 // Track number of requests.
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR>
-COUNTER ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::request_count_ = (COUNTER) 0;
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR>
+COUNTER ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::request_count_ = (COUNTER) 0;
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR>
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::ACE_Server_Logging_Handler_T 
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR>
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ACE_Server_Logging_Handler_T 
   (ACE_Thread_Manager *,
    LMR const &receiver) 
    // Initialize the CString to something that is not the empty string
@@ -33,15 +33,15 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::ACE_
 // Callback routine for handling the reception of remote logging
 // transmissions.
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR> int
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::handle_input (ACE_HANDLE)
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> int
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::handle_input (ACE_HANDLE)
 {
   int result = this->handle_logging_record ();
   return result > 0 ? result : -1;
 }
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR> const char *
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::host_name (void)
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> const char *
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::host_name (void)
 { 
 #if !defined (ACE_HAS_BROKEN_HPUX_TEMPLATES)
   return this->receiver_.m_.fast_rep ();
@@ -51,8 +51,8 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::host
 }
 
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR> int
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::handle_logging_record (void)
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> int
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::handle_logging_record (void)
 {
   ssize_t len;
 
@@ -115,8 +115,8 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::hand
 // Hook called by Server_Logging_Acceptor when connection is
 // established.
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LMR> int
-ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2, LMR>::open_common (void)
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR> int
+ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::open_common (void)
 {
   // Shut off non-blocking IO if it was enabled...
   if (this->peer ().disable (ACE_NONBLOCK) == -1)
diff --git a/netsvcs/lib/Server_Logging_Handler_T.h b/netsvcs/lib/Server_Logging_Handler_T.h
index ce56c087691..8f2345abd81 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/netsvcs/lib/Server_Logging_Handler_T.h
@@ -28,8 +28,8 @@
 #include "Base_Optimizer.h"
 #endif /* ACE_HAS_BROKEN_HPUX_TEMPLATES */
 
-template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1, class LOG_MESSAGE_RECEIVER>
-class ACE_Server_Logging_Handler_T : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH_2>
+template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LOG_MESSAGE_RECEIVER>
+class ACE_Server_Logging_Handler_T : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH_USE>
 {
   // = TITLE
   //    Product object created by an <ACE_Server_Logging_Acceptor_T>.  An