ChangeLogTag:Wed May 18 16:19:32 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

16 files changed, 145 insertions, 128 deletions

diff --git a/ChangeLog b/ChangeLog
index 627e1c95709..4d43de22a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,21 @@
 Wed May 18 16:19:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
+	* ace/ATM_Addr.cpp:
+	* ace/ATM_Addr.inl:
+	* ace/DEV_Addr.cpp:
+	* ace/DEV_Addr.inl:
+	* ace/FILE_Addr.cpp:
+	* ace/FILE_Addr.inl:
+	* ace/INET_Addr.cpp:
+	* ace/INET_Addr.inl:
+	* ace/MEM_Addr.cpp:
+	* ace/MEM_Addr.inl:
+	* ace/SPIPE_Addr.cpp:
+	* ace/SPIPE_Addr.inl:
 	* ace/Service_Types.cpp:
 	* ace/Service_Types.inl:
+	* ace/UNIX_Addr.cpp:
+	* ace/UNIX_Addr.inl:
 
 	  Moved virtual method implementation out-of-line.  Since the
 	  classes to which they belong are exported, inlining them will
@@ -9,6 +23,10 @@ Wed May 18 16:19:32 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	  binaries built with g++ 4.0's -fvisibility-inlines-hidden
 	  command line option.
 
+	* ace/Strategies_T.cpp (dump):
+
+	  Removed ACE_INLINE from this out of line method.
+
 Wed May 18 15:44:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * ace/Semaphore.cpp:
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index 189c67dfeef..17cb7ef87c6 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -114,6 +114,19 @@ ACE_ATM_Addr::ACE_ATM_Addr (const ACE_TCHAR sap[],
   this->set (sap, selector);
 }
 
+ACE_ATM_Addr::~ACE_ATM_Addr (void)
+{
+}
+
+// Return the address.
+
+void *
+ACE_ATM_Addr::get_addr (void) const
+{
+  ACE_TRACE ("ACE_ATM_Addr::get_addr");
+  return (void *) &this->atm_addr_;
+}
+
 void
 ACE_ATM_Addr::init (u_char selector)
 {
diff --git a/ace/ATM_Addr.inl b/ace/ATM_Addr.inl
index 48823c1ec81..e2cf062a706 100644
--- a/ace/ATM_Addr.inl
+++ b/ace/ATM_Addr.inl
@@ -3,20 +3,6 @@
 // $Id$
 
 
-ACE_INLINE
-ACE_ATM_Addr::~ACE_ATM_Addr (void)
-{
-}
-
-// Return the address.
-
-ACE_INLINE void *
-ACE_ATM_Addr::get_addr (void) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::get_addr");
-  return (void *) &this->atm_addr_;
-}
-
 ACE_INLINE u_char
 ACE_ATM_Addr::get_selector (void) const
 {
diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp
index 00dc5c81bcf..f954067ce3d 100644
--- a/ace/DEV_Addr.cpp
+++ b/ace/DEV_Addr.cpp
@@ -9,10 +9,33 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(ace, DEV_Addr, "$Id$")
+ACE_RCSID (ace,
+           DEV_Addr,
+           "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr)
 
+// Transform the current address into string format.
+
+int
+ACE_DEV_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
+{
+  ACE_TRACE ("ACE_DEV_Addr::addr_to_string");
+
+  ACE_OS::strsncpy (s, this->devname_, len);
+  return 0;
+}
+
+// Return a pointer to the address.
+
+void *
+ACE_DEV_Addr::get_addr (void) const
+{
+  ACE_TRACE ("ACE_DEV_Addr::get_addr");
+
+  return (void *) &this->devname_;
+}
+
 void
 ACE_DEV_Addr::dump (void) const
 {
diff --git a/ace/DEV_Addr.inl b/ace/DEV_Addr.inl
index c3fd906d0ad..fab0c2058d5 100644
--- a/ace/DEV_Addr.inl
+++ b/ace/DEV_Addr.inl
@@ -16,27 +16,6 @@ ACE_DEV_Addr::set (const ACE_TCHAR *devname)
   ACE_OS::strsncpy (this->devname_, devname, MAXPATHLEN);
 }
 
-// Transform the current address into string format.
-
-ACE_INLINE int
-ACE_DEV_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
-{
-  ACE_TRACE ("ACE_DEV_Addr::addr_to_string");
-
-  ACE_OS::strsncpy (s, this->devname_, len);
-  return 0;
-}
-
-// Return a pointer to the address.
-
-ACE_INLINE void *
-ACE_DEV_Addr::get_addr (void) const
-{
-  ACE_TRACE ("ACE_DEV_Addr::get_addr");
-
-  return (void *) &this->devname_;
-}
-
 // Compare two addresses for equality.
 
 ACE_INLINE bool
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 8a44c0757c5..6378b9aefa5 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -104,6 +104,14 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
   return 0;
 }
 
+// Return the address.
+
+void *
+ACE_FILE_Addr::get_addr (void) const
+{
+  return (void *) &this->filename_;
+}
+
 void
 ACE_FILE_Addr::dump (void) const
 {
diff --git a/ace/FILE_Addr.inl b/ace/FILE_Addr.inl
index 8db6f046434..cf6432bcefa 100644
--- a/ace/FILE_Addr.inl
+++ b/ace/FILE_Addr.inl
@@ -5,14 +5,6 @@
 
 #include "ace/SString.h"
 
-// Return the address.
-
-ACE_INLINE void *
-ACE_FILE_Addr::get_addr (void) const
-{
-  return (void *) &this->filename_;
-}
-
 // Compare two addresses for equality.
 
 ACE_INLINE bool
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 40ab908e41f..4f0c064f39b 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -96,6 +96,20 @@ ACE_INET_Addr::operator == (const ACE_INET_Addr &sap) const
                           this->get_size ()) == 0);
 }
 
+u_long
+ACE_INET_Addr::hash (void) const
+{
+#if defined (ACE_HAS_IPV6)
+  if (this->get_type () == PF_INET6)
+    {
+      const unsigned int *addr = (const unsigned int*)this->ip_addr_pointer();
+      return addr[0] + addr[1] + addr[2] + addr[3] + this->get_port_number();
+    }
+  else
+#endif /* ACE_HAS_IPV6 */
+  return this->get_ip_address () + this->get_port_number ();
+}
+
 ACE_INET_Addr::ACE_INET_Addr (void)
   : ACE_Addr (this->determine_type(), sizeof (inet_addr_))
 {
@@ -611,6 +625,10 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[],
 }
 #endif /* ACE_HAS_WCHAR */
 
+ACE_INET_Addr::~ACE_INET_Addr (void)
+{
+}
+
 int
 ACE_INET_Addr::get_host_name (char hostname[],
                               size_t len) const
diff --git a/ace/INET_Addr.inl b/ace/INET_Addr.inl
index 41743b5ae7f..383be7d1a7b 100644
--- a/ace/INET_Addr.inl
+++ b/ace/INET_Addr.inl
@@ -8,11 +8,6 @@
 #include "ace/OS_NS_arpa_inet.h"
 
 
-ACE_INLINE
-ACE_INET_Addr::~ACE_INET_Addr (void)
-{
-}
-
 ACE_INLINE void
 ACE_INET_Addr::reset (void)
 {
@@ -114,21 +109,6 @@ ACE_INET_Addr::get_addr_size (void) const
 #endif /* ACE_HAS_IPV6 */
 }
 
-
-ACE_INLINE u_long
-ACE_INET_Addr::hash (void) const
-{
-#if defined (ACE_HAS_IPV6)
-  if (this->get_type () == PF_INET6)
-    {
-      const unsigned int *addr = (const unsigned int*)this->ip_addr_pointer();
-      return addr[0] + addr[1] + addr[2] + addr[3] + this->get_port_number();
-    }
-  else
-#endif /* ACE_HAS_IPV6 */
-  return this->get_ip_address () + this->get_port_number ();
-}
-
 ACE_INLINE bool
 ACE_INET_Addr::operator < (const ACE_INET_Addr &rhs) const
 {
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index 48a914c83b0..e4ad1f353f0 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -55,6 +55,10 @@ ACE_MEM_Addr::ACE_MEM_Addr (u_short port_number)
   this->initialize_local (port_number);
 }
 
+ACE_MEM_Addr::~ACE_MEM_Addr (void)
+{
+}
+
 int
 ACE_MEM_Addr::initialize_local (u_short port_number)
 {
@@ -140,6 +144,12 @@ ACE_MEM_Addr::get_host_name (void) const
   return this->external_.get_host_name ();
 }
 
+u_long
+ACE_MEM_Addr::hash (void) const
+{
+  return this->external_.hash ();
+}
+
 void
 ACE_MEM_Addr::dump (void) const
 {
diff --git a/ace/MEM_Addr.inl b/ace/MEM_Addr.inl
index 9ebf3cced94..dd52742637d 100644
--- a/ace/MEM_Addr.inl
+++ b/ace/MEM_Addr.inl
@@ -6,11 +6,6 @@
 #include "ace/Global_Macros.h"
 
 
-ACE_INLINE
-ACE_MEM_Addr::~ACE_MEM_Addr (void)
-{
-}
-
 // Set the port number.
 
 ACE_INLINE void
@@ -111,9 +106,3 @@ ACE_MEM_Addr::operator != (const ACE_INET_Addr &sap) const
   ACE_TRACE ("ACE_MEM_Addr::operator !=");
   return !((*this) == sap);
 }
-
-ACE_INLINE u_long
-ACE_MEM_Addr::hash (void) const
-{
-  return this->external_.hash ();
-}
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 9a0332f052d..beb73d68b2d 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -33,6 +33,15 @@ ACE_SPIPE_Addr::set_addr (void *addr, int len)
 		  len);
 }
 
+// Return the address.
+
+void *
+ACE_SPIPE_Addr::get_addr (void) const
+{
+  return (void *) &this->SPIPE_addr_;
+}
+
+
 // Do nothing constructor.
 
 ACE_SPIPE_Addr::ACE_SPIPE_Addr (void)
@@ -43,6 +52,15 @@ ACE_SPIPE_Addr::ACE_SPIPE_Addr (void)
 			 sizeof this->SPIPE_addr_);
 }
 
+int
+ACE_SPIPE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
+{
+  ACE_OS::strsncpy (s,
+                    this->SPIPE_addr_.rendezvous_,
+                    len);
+  return 0;
+}
+
 // Transform the string into the current addressing format.
 
 int
diff --git a/ace/SPIPE_Addr.inl b/ace/SPIPE_Addr.inl
index 32b83289359..1c2858bc399 100644
--- a/ace/SPIPE_Addr.inl
+++ b/ace/SPIPE_Addr.inl
@@ -6,23 +6,6 @@
 #include "ace/SString.h"
 
 
-ACE_INLINE int
-ACE_SPIPE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
-{
-  ACE_OS::strsncpy (s,
-                    this->SPIPE_addr_.rendezvous_,
-                    len);
-  return 0;
-}
-
-// Return the address.
-
-ACE_INLINE void *
-ACE_SPIPE_Addr::get_addr (void) const
-{
-  return (void *) &this->SPIPE_addr_;
-}
-
 // Compare two addresses for equality.
 
 ACE_INLINE bool
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 24b761132db..a3f2a8ff9ef 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -1235,7 +1235,7 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class SVC_HANDLER> ACE_INLINE void
+template <class SVC_HANDLER> void
 ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 4a0ed531b72..4732c21cb6d 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -24,6 +24,41 @@ ACE_UNIX_Addr::set_addr (void *addr, int len)
 		  len);
 }
 
+// Return a pointer to the underlying address.
+
+void *
+ACE_UNIX_Addr::get_addr (void) const
+{
+  return (void *) &this->unix_addr_;
+}
+
+// Transform the string into the current addressing format.
+
+int
+ACE_UNIX_Addr::string_to_addr (const char addr[])
+{
+  ACE_OS::strsncpy (this->unix_addr_.sun_path, addr,
+                    sizeof this->unix_addr_.sun_path);
+  return 0;
+}
+
+// Transform the current address into string format.
+
+int
+ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
+{
+  ACE_OS::strsncpy (s,
+                    ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path),
+                    len);
+  return 0;
+}
+
+u_long
+ACE_UNIX_Addr::hash (void) const
+{
+  return ACE::hash_pjw (this->unix_addr_.sun_path);
+}
+
 void
 ACE_UNIX_Addr::dump (void) const
 {
diff --git a/ace/UNIX_Addr.inl b/ace/UNIX_Addr.inl
index a5a755f20c4..966fc1118ea 100644
--- a/ace/UNIX_Addr.inl
+++ b/ace/UNIX_Addr.inl
@@ -8,35 +8,6 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
-// Return a pointer to the underlying address.
-
-ACE_INLINE void *
-ACE_UNIX_Addr::get_addr (void) const
-{
-  return (void *) &this->unix_addr_;
-}
-
-// Transform the string into the current addressing format.
-
-ACE_INLINE int
-ACE_UNIX_Addr::string_to_addr (const char addr[])
-{
-  ACE_OS::strsncpy (this->unix_addr_.sun_path, addr,
-                    sizeof this->unix_addr_.sun_path);
-  return 0;
-}
-
-// Transform the current address into string format.
-
-ACE_INLINE int
-ACE_UNIX_Addr::addr_to_string (ACE_TCHAR s[], size_t len) const
-{
-  ACE_OS::strsncpy (s,
-                    ACE_TEXT_CHAR_TO_TCHAR (this->unix_addr_.sun_path),
-                    len);
-  return 0;
-}
-
 #if defined (ACE_HAS_WCHAR)
 /// Creates an ACE_UNIX_Addr from a string.
 ACE_INLINE
@@ -79,10 +50,4 @@ ACE_UNIX_Addr::get_path_name (void) const
   return this->unix_addr_.sun_path;
 }
 
-ACE_INLINE u_long
-ACE_UNIX_Addr::hash (void) const
-{
-  return ACE::hash_pjw (this->unix_addr_.sun_path);
-}
-
 #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */