Thu Feb 19 14:01:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Default_Constants.h:
        * ace/Log_Msg_IPC.cpp:
        * ace/Log_Msg_IPC.h:
        * netsvcs/lib/Client_Logging_Handler.cpp:
        * netsvcs/lib/Client_Logging_Handler.h:
          Added new ACE_HAS_STREAM_LOG_MSG_IPC which controls whether the
          ACE Log_Msg IPC should use streams or not. When ACE_HAS_STREAM_PIPES
          is defined we default to 1, else to 0. We do see that using stream
          pipes causes problems on at least Solaris, so the user can decide
          to set this value explicitly to 0

        * ace/CDR_Stream.cpp:
        * ace/CDR_Stream.h:
        * ace/Message_Block.inl:
          Doxygen and layout changes

        * ace/Message_Block.cpp:
          Use %@ for pointers

2 files changed, 8 insertions, 8 deletions

diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 0ef1f7bd05e..84a59ac7d1f 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -123,7 +123,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   // Align the Message Block for a CDR stream
   ACE_CDR::mb_align (header.get ());
 
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
   // We're getting a logging message from a local application using
   // STREAM pipes, which are nicely prioritized for us.
   ACE_Str_Buf header_msg (header->wr_ptr (),
@@ -193,7 +193,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
       // Just fall through in this case..
       break;
     }
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
 
   // Reflect addition of 8 bytes for the header.
   header->wr_ptr (8);
@@ -231,7 +231,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   // Ensure there's sufficient room for log record payload.
   ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
 
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
   ACE_Str_Buf payload_msg (payload->wr_ptr (),
                            0,
                            length);
@@ -281,7 +281,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
       ACE_OS::closesocket (handle);
       return 0;
     }
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
 
   // Reflect additional bytes for the message.
   payload->wr_ptr (length);
@@ -569,7 +569,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
   ACE_SOCK_Stream stream;
   ACE_INET_Addr server_addr;
 
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
   ACE_SPIPE_Addr lserver_addr;
 
   // Figure out what local port we're really bound to.
@@ -599,7 +599,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("bounded to local port %d on handle %u\n"),
               lserver_addr.get_port_number (),
               this->acceptor ().get_handle ()));
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
 
   if (con.connect (stream,
                    this->server_addr_,
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.h b/ACE/netsvcs/lib/Client_Logging_Handler.h
index a83260f083c..6a36c2be8e9 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.h
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.h
@@ -24,7 +24,7 @@
 #include "ace/Svc_Handler.h"
 #include "ace/svc_export.h"
 
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
 #define LOGGING_STREAM ACE_SPIPE_STREAM
 #define LOGGING_ACCEPTOR ACE_SPIPE_ACCEPTOR
 #define LOGGING_ADDR ACE_SPIPE_Addr
@@ -32,7 +32,7 @@
 #define LOGGING_STREAM ACE_SOCK_STREAM
 #define LOGGING_ACCEPTOR ACE_SOCK_ACCEPTOR
 #define LOGGING_ADDR ACE_INET_Addr
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class ACE_Svc_Export ACE_Svc_Handler<LOGGING_STREAM, ACE_NULL_SYNCH>;