*** empty log message ***

9 files changed, 10 insertions, 9 deletions

diff --git a/ace/ACE_Library.mdp b/ace/ACE_Library.mdp
index dd7367ecaa5..8bc4b8634a5 100644
--- a/ace/ACE_Library.mdp
+++ b/ace/ACE_Library.mdp
diff --git a/ace/Addr.cpp b/ace/Addr.cpp
index d7671801956..36d73803c5c 100644
--- a/ace/Addr.cpp
+++ b/ace/Addr.cpp
@@ -5,7 +5,7 @@
 #include "ace/Addr.h"
 
 // This is a static class variable. 
-const ACE_Addr ACE_Addr::sap_any;
+const ACE_Addr ACE_Addr::sap_any (-1, -1);
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Addr.i"
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 0d614ad7d86..e775a6f4a24 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -67,7 +67,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address,
     }
 
   // If port is not specified, bind to any port
-  if (&address == &ACE_Addr::sap_any &&
+  if (address == ACE_Addr::sap_any &&
       ACE::bind_port (this->listen_handle_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE::bind_port"), -1);
 
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 4eaeb652b69..12e771145ba 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -23,6 +23,7 @@
   class ACE_Mutex;
   class ACE_Null_Mutex;
   class ACE_Thread_Mutex;
+  class ACE_Mutex;
   class ACE_Recursive_Thread_Mutex;
   class ACE_RW_Thread_Mutex;
 #endif /* ACE_MT_SAFE */
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 3b26fa273d8..4037423d08a 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -74,7 +74,7 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
   if (ACE_SOCK::open (SOCK_STREAM, protocol_family, 
 		      protocol, reuse_addr) == -1)
     error = 1;
-  else if (&local_sap == &ACE_Addr::sap_any 
+  else if (local_sap == ACE_Addr::sap_any 
 	   && protocol_family == PF_INET)
     {
       if (ACE::bind_port (this->get_handle ()) == -1)
diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp
index eb15e357c43..a4bf039a8df 100644
--- a/ace/SOCK_CODgram.cpp
+++ b/ace/SOCK_CODgram.cpp
@@ -58,7 +58,7 @@ ACE_SOCK_CODgram::open (const ACE_Addr &remote, const ACE_Addr &local,
     {
       int error = 0;
 
-      if (&local == &ACE_Addr::sap_any && &remote == &ACE_Addr::sap_any)
+      if (local == ACE_Addr::sap_any && remote == ACE_Addr::sap_any)
 	{
 	  // Assign an arbitrary port number from the transient range!!
 
@@ -67,14 +67,14 @@ ACE_SOCK_CODgram::open (const ACE_Addr &remote, const ACE_Addr &local,
 	    error = 1;
 	}
       // We are binding just the local address. 
-      else if (&local != &ACE_Addr::sap_any && &remote == &ACE_Addr::sap_any)
+      else if (local != ACE_Addr::sap_any && remote == ACE_Addr::sap_any)
 	{
 	  if (ACE_OS::bind (this->get_handle (), (sockaddr *) local.get_addr (), 
 		      local.get_size ()) == -1)
 	    error = 1;
 	}
       // We are connecting to the remote address. 
-      else if (&local == &ACE_Addr::sap_any && &remote != &ACE_Addr::sap_any)
+      else if (local == ACE_Addr::sap_any && remote != ACE_Addr::sap_any)
 	{
 	  if (ACE_OS::connect (this->get_handle (), (sockaddr *) remote.get_addr (), 
 			 remote.get_size ()) == -1)
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp
index e0ad3a96973..80f9bb17c51 100644
--- a/ace/SOCK_Dgram.cpp
+++ b/ace/SOCK_Dgram.cpp
@@ -68,7 +68,7 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local,
   ACE_TRACE ("ACE_SOCK_Dgram::shared_open");
   int error = 0;
 
-  if (&local == &ACE_Addr::sap_any && protocol_family == PF_INET)
+  if (local == ACE_Addr::sap_any && protocol_family == PF_INET)
     {
       if (ACE::bind_port (this->get_handle ()) == -1)
         error = 1;
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index 4e979b6075f..eb59315f05a 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -298,7 +298,7 @@ ACE_TLI_Acceptor::open (const ACE_Addr &remote_sap,
       req.qlen = qlen;
       req.addr.maxlen = remote_sap.get_size ();
 
-      if (&remote_sap == &ACE_Addr::sap_any)
+      if (remote_sap == ACE_Addr::sap_any)
 	// Note that if addr.len == 0 then ACE_TLI selects the port number.
 	req.addr.len = 0;
       else
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 2d628f84dd0..defa11762c5 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -51,7 +51,7 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
   else // Borrow the handle from the NEW_STREAM. 
     this->set_handle (new_stream.get_handle ());
 
-  if (&local_sap != &ACE_Addr::sap_any)
+  if (local_sap != ACE_Addr::sap_any)
     {
       // Bind the local endpoint to a specific addr.