Fixing inline problems

12 files changed, 33 insertions, 14 deletions

diff --git a/ace/ATM_Acceptor.cpp b/ace/ATM_Acceptor.cpp
index 5fb21ab57cd..0990c5a9df1 100644
--- a/ace/ATM_Acceptor.cpp
+++ b/ace/ATM_Acceptor.cpp
@@ -7,8 +7,9 @@ ACE_RCSID(ace, ATM_Acceptor, "$Id$")
 
 #if defined (ACE_HAS_ATM)
 
-// Put the actual definitions of the ACE_ATM_Request and
-// ACE_ATM_Request_Queue classes here to hide them from clients...
+#if !defined (__ACE_INLINE__)
+#include "ace/ATM_Acceptor.i"
+#endif /* __ACE_INLINE__ */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Acceptor)
 
diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index 4401186d2fa..6b8158d7a01 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -92,7 +92,9 @@ private:
   ATM_Acceptor acceptor_;
 };
 
+#if defined (__ACE_INLINE__)
 #include "ace/ATM_Acceptor.i"
+#endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
 #endif /* ACE_ATM_ACCEPTOR_H */
diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp
index 68c1a740e46..2d4f03be550 100644
--- a/ace/ATM_Connector.cpp
+++ b/ace/ATM_Connector.cpp
@@ -9,6 +9,10 @@ ACE_RCSID(ace, ATM_Connector, "$Id$")
 
 #if defined (ACE_HAS_ATM)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/ATM_Connector.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Connector)
 
 void
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index ff60848a28c..62739b9cde5 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -122,7 +122,9 @@ private:
   ATM_Connector connector_;
 };
 
+#if defined (__ACE_INLINE__)
 #include "ace/ATM_Connector.i"
+#endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
 #endif /* ACE_ATM_CONNECTOR_H */
diff --git a/ace/ATM_Params.cpp b/ace/ATM_Params.cpp
index a5cc7486917..54a53ef03a1 100644
--- a/ace/ATM_Params.cpp
+++ b/ace/ATM_Params.cpp
@@ -3,14 +3,14 @@
 #define ACE_BUILD_DLL
 #include "ace/ATM_Params.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/ATM_Params.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ace, ATM_Params, "$Id$")
 
 #if defined (ACE_HAS_ATM)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/ATM_Params.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Params)
 
 void
diff --git a/ace/ATM_QoS.cpp b/ace/ATM_QoS.cpp
index 46a9f6f4c3a..c86c661b2d8 100644
--- a/ace/ATM_QoS.cpp
+++ b/ace/ATM_QoS.cpp
@@ -3,14 +3,14 @@
 #define ACE_BUILD_DLL
 #include "ace/ATM_QoS.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/ATM_QoS.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ace, ATM_QoS, "$Id$")
 
 #if defined (ACE_HAS_ATM)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/ATM_QoS.i"
+#endif /* __ACE_INLINE__ */
+
 #if defined (ACE_HAS_FORE_ATM_XTI) || defined (ACE_HAS_FORE_ATM_WS2)
 #define BHLI_MAGIC "FORE_ATM"
 // This is line rate in cells/s for an OC-3 MM interface.
diff --git a/ace/ATM_Stream.cpp b/ace/ATM_Stream.cpp
index 1788b1f9680..436a5bdc85b 100644
--- a/ace/ATM_Stream.cpp
+++ b/ace/ATM_Stream.cpp
@@ -10,6 +10,10 @@ ACE_RCSID(ace, ATM_Stream, "$Id$")
 
 #if defined (ACE_HAS_ATM)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/ATM_Stream.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Stream)
 
 void
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index 5519247ee90..0995ea7a332 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -79,7 +79,9 @@ private:
   // Typedef'd to the appropriate stream mechanism above
 };
 
+#if defined (__ACE_INLINE__)
 #include "ace/ATM_Stream.i"
+#endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_ATM */
 #endif /* ACE_ATM_STREAM_H */
diff --git a/ace/ATM_Stream.i b/ace/ATM_Stream.i
index 567d68d7da9..ab7c8804f68 100644
--- a/ace/ATM_Stream.i
+++ b/ace/ATM_Stream.i
@@ -3,8 +3,6 @@
 
 // ATM_Stream.i
 
-#include "ace/ATM_Stream.h"
-
 ACE_INLINE
 ACE_ATM_Stream::ACE_ATM_Stream (void)
 {
diff --git a/ace/XTI_ATM_Mcast.cpp b/ace/XTI_ATM_Mcast.cpp
index eeefdf703a5..cd93da71b7c 100644
--- a/ace/XTI_ATM_Mcast.cpp
+++ b/ace/XTI_ATM_Mcast.cpp
@@ -8,6 +8,10 @@ ACE_RCSID(ace, XTI_ATM_Mcast, "$Id$")
 
 #if defined (ACE_HAS_XTI_ATM)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/XTI_ATM_Mcast.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_XTI_ATM_Mcast)
 
 void
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index 7a17b3c84a4..a70e3d76543 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -113,7 +113,9 @@ public:
   // Declare the dynamic allocation hooks.
 };
 
+#if defined (__ACE_INLINE__)
 #include "ace/XTI_ATM_Mcast.i"
+#endif /* __ACE_INLINE__ */
 
 #endif /* ACE_HAS_XTI_ATM */
 #endif /* ACE_XTI_ATM_MCAST_H */
diff --git a/ace/XTI_ATM_Mcast.i b/ace/XTI_ATM_Mcast.i
index 4643d48603b..95345033760 100644
--- a/ace/XTI_ATM_Mcast.i
+++ b/ace/XTI_ATM_Mcast.i
@@ -3,7 +3,7 @@
 
 // XTI_ATM_Mcast.i
 
-inline
+ACE_INLINE
 ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, 
 				      const ACE_Addr &remote_sap, 
 				      ACE_Time_Value *timeout,
@@ -31,7 +31,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream,
 // through function to ACE_TLI_Connector::connect(). It is over-
 // ridden to change the default device from TCP to XTI/ATM.
 
-inline
+ACE_INLINE
 int
 ACE_XTI_ATM_Mcast::connect (ACE_TLI_Stream &new_stream, 
 			    const ACE_Addr &remote_sap,