ChangeLogTag:Wed Nov 10 23:03:27 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

8 files changed, 30 insertions, 26 deletions

diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp
index 5102d1e59b5..b4ad6a2b186 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/ace/SSL/SSL_SOCK_Acceptor.cpp
@@ -1,10 +1,13 @@
-// SSL_SOCK_Acceptor.cpp
+//
 // $Id$
+//
+
 #define ACE_BUILD_DLL
-#include "ace/SSL_SOCK_Acceptor.h"
+
+#include "SSL_SOCK_Acceptor.h"
+#include "SSL.h"
 
 #include "ace/Synch.h"
-#include "ace/SSL.h"
 
 #if defined (ACE_HAS_SSL)
 
diff --git a/ace/SSL/SSL_SOCK_Acceptor.h b/ace/SSL/SSL_SOCK_Acceptor.h
index 4da1ccf1d29..fb2fb5a08fb 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/ace/SSL/SSL_SOCK_Acceptor.h
@@ -17,7 +17,7 @@
 #ifndef ACE_SSL_SOCK_ACCEPTOR_H
 #define ACE_SSL_SOCK_ACCEPTOR_H
 
-#include "ace/SSL_SOCK_Stream.h"
+#include "SSL_SOCK_Stream.h"
 #include "ace/SOCK_Acceptor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -149,7 +149,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SSL_SOCK_Acceptor.i"
+#include "SSL_SOCK_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #endif /* ACE_SSL_SOCK_ACCEPTOR_H */
diff --git a/ace/SSL/SSL_SOCK_Acceptor.i b/ace/SSL/SSL_SOCK_Acceptor.i
index 11eb7a7b2cf..f1714f937d3 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.i
+++ b/ace/SSL/SSL_SOCK_Acceptor.i
@@ -7,11 +7,13 @@
 
 // Do nothing routine for constructor.
 
+ACE_INLINE
 ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
 }
 
+ACE_INLINE
 ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
                                               int reuse_addr,
                                               int protocol_family,
@@ -23,6 +25,7 @@ ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
 }
 // Performs the timed accept operation.
 
+ACE_INLINE
 ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
                                               ACE_Protocol_Info *protocolinfo,
                                               ACE_SOCK_GROUP g,
@@ -43,9 +46,7 @@ ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor (const ACE_Addr &local_sap,
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::ACE_SSL_SOCK_Acceptor");
 }
 
-
-
-int
+ACE_INLINE int
 ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap,
                                 int reuse_addr,
                                 int protocol_family,
@@ -59,7 +60,8 @@ ACE_SSL_SOCK_Acceptor::open (const ACE_Addr &local_sap,
                          backlog,
                          protocol);
 }
-int
+
+ACE_INLINE int
 ACE_SSL_SOCK_Acceptor::close (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::close ()");
@@ -67,41 +69,41 @@ ACE_SSL_SOCK_Acceptor::close (void)
 }
 
 
+ACE_INLINE
 ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor (void)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::~ACE_SSL_SOCK_Acceptor");
 }
 
-
-int
+ACE_INLINE int
 ACE_SSL_SOCK_Acceptor::control (int cmd, void* dummy) const
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::control");
   return acceptor_.control (cmd, dummy);
 }
 
-ACE_HANDLE
+ACE_INLINE ACE_HANDLE
 ACE_SSL_SOCK_Acceptor::get_handle (void) const
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::get_handle");
   return acceptor_.get_handle ();
 }
 
-void
+ACE_INLINE void
 ACE_SSL_SOCK_Acceptor::set_handle (ACE_HANDLE handle)
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::set_handle");
   acceptor_.set_handle (handle);
 }
 
-int
+ACE_INLINE int
 ACE_SSL_SOCK_Acceptor::get_local_addr (ACE_Addr &addr) const
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::get_local_addr");
   return acceptor_.get_local_addr (addr);
 }
 
-void
+ACE_INLINE void
 ACE_SSL_SOCK_Acceptor::dump (void) const
 {
   ACE_TRACE ("ACE_SSL_SOCK_Acceptor::dump");
diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp
index 137ef777602..2d51b36f7b4 100644
--- a/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ace/SSL/SSL_SOCK_Connector.cpp
@@ -4,15 +4,15 @@
 
 #define ACE_BUILD_DLL
 
-#include "ace/SSL_SOCK_Connector.h"
+#include "SSL_SOCK_Connector.h"
+#include "SSL.h"
 #include "ace/Handle_Set.h"
 #include "ace/INET_Addr.h"
-#include "ace/SSL.h"
 
 #if defined (ACE_HAS_SSL)
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SSL_SOCK_Connector.i"
+#include "SSL_SOCK_Connector.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 
diff --git a/ace/SSL/SSL_SOCK_Connector.h b/ace/SSL/SSL_SOCK_Connector.h
index 36dec1ed4e0..e7ed28f6389 100644
--- a/ace/SSL/SSL_SOCK_Connector.h
+++ b/ace/SSL/SSL_SOCK_Connector.h
@@ -17,9 +17,8 @@
 #ifndef ACE_SSL_SOCK_CONNECTOR_H
 #define ACE_SSL_SOCK_CONNECTOR_H
 
+#include "SSL_SOCK_Stream.h"
 #include "ace/SOCK_Connector.h"
-#include "ace/SSL_SOCK_Stream.h"
-
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -189,7 +188,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SSL_SOCK_Connector.i"
+#include "SSL_SOCK_Connector.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #endif /* ACE_SSL_SOCK_CONNECTOR_H */
diff --git a/ace/SSL/SSL_SOCK_Stream.cpp b/ace/SSL/SSL_SOCK_Stream.cpp
index 75a97c86753..b3ec5d0a3cb 100644
--- a/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ace/SSL/SSL_SOCK_Stream.cpp
@@ -4,7 +4,7 @@
 #define ACE_BUILD_DLL
 
 #include "SSL_SOCK_Stream.h"
-#include "Handle_Set.h"
+#include "ace/Handle_Set.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "SSL_SOCK_Stream.i"
diff --git a/ace/SSL/SSL_SOCK_Stream.h b/ace/SSL/SSL_SOCK_Stream.h
index c4fa2358c9e..6c78aa3bd8b 100644
--- a/ace/SSL/SSL_SOCK_Stream.h
+++ b/ace/SSL/SSL_SOCK_Stream.h
@@ -17,10 +17,11 @@
 #ifndef ACE_SSL_SOCK_STREAM_H
 #define ACE_SSL_SOCK_STREAM_H
 
+#include "SSL.h"
+
 #if defined (ACE_HAS_SSL)
 
-#include "SSL.h"
-#include "SOCK_Stream.h"
+#include "ace/SOCK_Stream.h"
 #include <openssl/ssl.h>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -259,7 +260,7 @@ private:
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/SSL_SOCK_Stream.i"
+#include "SSL_SOCK_Stream.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 #endif /* ACE_SSL_SOCK_STREAM_H */
diff --git a/ace/SSL/SSL_SOCK_Stream.i b/ace/SSL/SSL_SOCK_Stream.i
index 67ce2666445..09750157e26 100644
--- a/ace/SSL/SSL_SOCK_Stream.i
+++ b/ace/SSL/SSL_SOCK_Stream.i
@@ -3,7 +3,6 @@
 
 // SOCK_Stream.i
 
-#include "SOCK_Stream.h"
 #if defined (ACE_HAS_SSL)
 
 ASYS_INLINE