diff options
-rw-r--r-- | ChangeLog-97b | 24 | ||||
-rw-r--r-- | TAO/tao/TAO.mak | 10 | ||||
-rw-r--r-- | TAO/tao/TAO.mdp | bin | 58368 -> 58368 bytes | |||
-rw-r--r-- | TAO/tests/Cubit/TAO/DII_Cubit/test.mak | 4 | ||||
-rw-r--r-- | TAO/tests/Cubit/TAO/DII_Cubit/test.mdp | bin | 69632 -> 69632 bytes | |||
-rw-r--r-- | TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak | 75 | ||||
-rw-r--r-- | TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp | bin | 71680 -> 72192 bytes | |||
-rw-r--r-- | ace/ACE_Library.mdp | bin | 163328 -> 163328 bytes | |||
-rw-r--r-- | ace/Addr.cpp | 2 | ||||
-rw-r--r-- | ace/Asynch_Acceptor.cpp | 2 | ||||
-rw-r--r-- | ace/Object_Manager.h | 1 | ||||
-rw-r--r-- | ace/SOCK_Acceptor.cpp | 2 | ||||
-rw-r--r-- | ace/SOCK_CODgram.cpp | 6 | ||||
-rw-r--r-- | ace/SOCK_Dgram.cpp | 2 | ||||
-rw-r--r-- | ace/TLI_Acceptor.cpp | 2 | ||||
-rw-r--r-- | ace/TLI_Connector.cpp | 2 | ||||
-rw-r--r-- | tests/tests.mak | 2 | ||||
-rw-r--r-- | tests/tests.mdp | bin | 6756 -> 2908 bytes |
18 files changed, 119 insertions, 15 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 1c86117510c..3fc0009c550 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,27 @@ +Thu Nov 06 22:13:01 1997 <irfan@TWOSTEP> + + * ace: Changed the comparison &local_sap == &ACE_Addr::sap_any to + local_sap == ACE_Addr::sap_any. Thanks to Steve Coy + <stevec@magna.com.au> for pointing out that the default + parameter const ACE_Addr &local_sap = ACE_Addr::sap_any will + cause a copy of sap_any to be made and passed to the method, + invalidating the memory address comparison. + + The following files were effected: + + Asynch_Acceptor.cpp + SOCK_Acceptor.cpp + SOCK_CODgram.cpp + SOCK_Dgram.cpp + TLI_Acceptor.cpp + TLI_Connector.cpp + + * ace/Addr.cpp: Made sure that the type and size of + ACE_Addr::sap_any does not match the type and size of any other + Addr type. This is necessary for local_addr==ACE_Addr::sap_any + to return 0 when local_addr is anything other than + ACE_Addr::sap_any. + Thu Nov 6 19:40:41 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Object_Manager: Added support for diff --git a/TAO/tao/TAO.mak b/TAO/tao/TAO.mak index efb3b22bc31..bb46014b935 100644 --- a/TAO/tao/TAO.mak +++ b/TAO/tao/TAO.mak @@ -1023,6 +1023,8 @@ DEP_CPP_CONNE=\ {$(INCLUDE)}"\ace\Containers.i"\
{$(INCLUDE)}"\ace\Dynamic.h"\
{$(INCLUDE)}"\ace\Dynamic.i"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.cpp"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.h"\
{$(INCLUDE)}"\ace\Event_Handler.h"\
{$(INCLUDE)}"\ace\Event_Handler.i"\
{$(INCLUDE)}"\ace\Free_List.cpp"\
@@ -1077,6 +1079,8 @@ DEP_CPP_CONNE=\ {$(INCLUDE)}"\ace\Service_Config.i"\
{$(INCLUDE)}"\ace\Service_Object.h"\
{$(INCLUDE)}"\ace\Service_Object.i"\
+ {$(INCLUDE)}"\ace\Service_Repository.h"\
+ {$(INCLUDE)}"\ace\Service_Repository.i"\
{$(INCLUDE)}"\ace\Service_Types.h"\
{$(INCLUDE)}"\ace\Service_Types.i"\
{$(INCLUDE)}"\ace\Shared_Object.h"\
@@ -3495,6 +3499,8 @@ DEP_CPP_IIOPOR=\ {$(INCLUDE)}"\ace\Containers.i"\
{$(INCLUDE)}"\ace\Dynamic.h"\
{$(INCLUDE)}"\ace\Dynamic.i"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.cpp"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.h"\
{$(INCLUDE)}"\ace\Event_Handler.h"\
{$(INCLUDE)}"\ace\Event_Handler.i"\
{$(INCLUDE)}"\ace\Free_List.cpp"\
@@ -3549,6 +3555,8 @@ DEP_CPP_IIOPOR=\ {$(INCLUDE)}"\ace\Service_Config.i"\
{$(INCLUDE)}"\ace\Service_Object.h"\
{$(INCLUDE)}"\ace\Service_Object.i"\
+ {$(INCLUDE)}"\ace\Service_Repository.h"\
+ {$(INCLUDE)}"\ace\Service_Repository.i"\
{$(INCLUDE)}"\ace\Service_Types.h"\
{$(INCLUDE)}"\ace\Service_Types.i"\
{$(INCLUDE)}"\ace\Shared_Object.h"\
@@ -6805,6 +6813,8 @@ DEP_CPP_TAO_I=\ {$(INCLUDE)}"\ace\Containers.i"\
{$(INCLUDE)}"\ace\Dynamic.h"\
{$(INCLUDE)}"\ace\Dynamic.i"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.cpp"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.h"\
{$(INCLUDE)}"\ace\Event_Handler.h"\
{$(INCLUDE)}"\ace\Event_Handler.i"\
{$(INCLUDE)}"\ace\Free_List.cpp"\
diff --git a/TAO/tao/TAO.mdp b/TAO/tao/TAO.mdp Binary files differindex 14e3f9aef2f..0d6e035f1f1 100644 --- a/TAO/tao/TAO.mdp +++ b/TAO/tao/TAO.mdp diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak b/TAO/tests/Cubit/TAO/DII_Cubit/test.mak index 4cba7134f2b..df1a21123e0 100644 --- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak +++ b/TAO/tests/Cubit/TAO/DII_Cubit/test.mak @@ -1183,6 +1183,8 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Containers.i"\
{$(INCLUDE)}"\ace\Dynamic.h"\
{$(INCLUDE)}"\ace\Dynamic.i"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.cpp"\
+ {$(INCLUDE)}"\ace\Dynamic_Service.h"\
{$(INCLUDE)}"\ace\Event_Handler.h"\
{$(INCLUDE)}"\ace\Event_Handler.i"\
{$(INCLUDE)}"\ace\Free_List.cpp"\
@@ -1237,6 +1239,8 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Service_Config.i"\
{$(INCLUDE)}"\ace\Service_Object.h"\
{$(INCLUDE)}"\ace\Service_Object.i"\
+ {$(INCLUDE)}"\ace\Service_Repository.h"\
+ {$(INCLUDE)}"\ace\Service_Repository.i"\
{$(INCLUDE)}"\ace\Service_Types.h"\
{$(INCLUDE)}"\ace\Service_Types.i"\
{$(INCLUDE)}"\ace\Shared_Object.h"\
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp b/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp Binary files differindex e83278be313..d236c4f7393 100644 --- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp +++ b/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak index 0cceef5da57..0732a8d8b64 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak @@ -326,7 +326,10 @@ SOURCE=.\svr.cpp DEP_CPP_SVR_C=\
".\cubit_i.h"\
+ ".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
+ ".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
@@ -528,21 +531,29 @@ NODEP_CPP_SVR_C=\ "..\..\..\..\tao\tao\factories.h"\
-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitS.h"
+"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitS.h"\
+ ".\cubitC.h" ".\cubitC.i" ".\cubitS.i"
!ELSEIF "$(CFG)" == "server - Win32 Debug"
DEP_CPP_SVR_C=\
".\cubit_i.h"\
+ ".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
+ ".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
{$(INCLUDE)}"\ace\ACE.h"\
+ {$(INCLUDE)}"\ace\ACE.i"\
{$(INCLUDE)}"\ace\Addr.h"\
{$(INCLUDE)}"\ace\Addr.i"\
{$(INCLUDE)}"\ace\Atomic_Op.i"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.h"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.i"\
{$(INCLUDE)}"\ace\config-win32-common.h"\
{$(INCLUDE)}"\ace\config-win32.h"\
{$(INCLUDE)}"\ace\config.h"\
@@ -562,6 +573,7 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Free_List.h"\
{$(INCLUDE)}"\ace\Free_List.i"\
{$(INCLUDE)}"\ace\Get_Opt.h"\
+ {$(INCLUDE)}"\ace\Get_Opt.i"\
{$(INCLUDE)}"\ace\Handle_Set.h"\
{$(INCLUDE)}"\ace\Handle_Set.i"\
{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\
@@ -580,6 +592,9 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\
{$(INCLUDE)}"\ace\Malloc_T.h"\
{$(INCLUDE)}"\ace\Malloc_T.i"\
+ {$(INCLUDE)}"\ace\Managed_Object.cpp"\
+ {$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -596,7 +611,9 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Module.h"\
{$(INCLUDE)}"\ace\Module.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
+ {$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\Reactor.h"\
{$(INCLUDE)}"\ace\Reactor.i"\
{$(INCLUDE)}"\ace\Reactor_Impl.h"\
@@ -663,6 +680,7 @@ DEP_CPP_SVR_C=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\Version.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -726,7 +744,8 @@ NODEP_CPP_SVR_C=\ "..\..\..\..\tao\tao\factories.h"\
-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitS.h"
+"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitS.h"\
+ ".\cubitC.h" ".\cubitC.i" ".\cubitS.i"
!ENDIF
@@ -741,6 +760,7 @@ SOURCE=.\cubitS.cpp DEP_CPP_CUBIT=\
".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
@@ -945,22 +965,27 @@ NODEP_CPP_CUBIT=\ "$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitC.h"\
- ".\cubitS.h" ".\cubitS.i"
+ ".\cubitS.h" ".\cubitS.i" ".\cubitC.i"
!ELSEIF "$(CFG)" == "server - Win32 Debug"
DEP_CPP_CUBIT=\
".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
{$(INCLUDE)}"\ace\ACE.h"\
+ {$(INCLUDE)}"\ace\ACE.i"\
{$(INCLUDE)}"\ace\Addr.h"\
{$(INCLUDE)}"\ace\Addr.i"\
{$(INCLUDE)}"\ace\Atomic_Op.i"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.h"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.i"\
{$(INCLUDE)}"\ace\config-win32-common.h"\
{$(INCLUDE)}"\ace\config-win32.h"\
{$(INCLUDE)}"\ace\config.h"\
@@ -980,6 +1005,7 @@ DEP_CPP_CUBIT=\ {$(INCLUDE)}"\ace\Free_List.h"\
{$(INCLUDE)}"\ace\Free_List.i"\
{$(INCLUDE)}"\ace\Get_Opt.h"\
+ {$(INCLUDE)}"\ace\Get_Opt.i"\
{$(INCLUDE)}"\ace\Handle_Set.h"\
{$(INCLUDE)}"\ace\Handle_Set.i"\
{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\
@@ -998,6 +1024,9 @@ DEP_CPP_CUBIT=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\
{$(INCLUDE)}"\ace\Malloc_T.h"\
{$(INCLUDE)}"\ace\Malloc_T.i"\
+ {$(INCLUDE)}"\ace\Managed_Object.cpp"\
+ {$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -1014,7 +1043,9 @@ DEP_CPP_CUBIT=\ {$(INCLUDE)}"\ace\Module.h"\
{$(INCLUDE)}"\ace\Module.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
+ {$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\Reactor.h"\
{$(INCLUDE)}"\ace\Reactor.i"\
{$(INCLUDE)}"\ace\Reactor_Impl.h"\
@@ -1081,6 +1112,7 @@ DEP_CPP_CUBIT=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\Version.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -1145,7 +1177,7 @@ NODEP_CPP_CUBIT=\ "$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitC.h"\
- ".\cubitS.h" ".\cubitS.i"
+ ".\cubitS.h" ".\cubitS.i" ".\cubitC.i"
!ENDIF
@@ -1160,7 +1192,10 @@ SOURCE=.\cubit_i.cpp DEP_CPP_CUBIT_=\
".\cubit_i.h"\
+ ".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
+ ".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
@@ -1362,21 +1397,29 @@ NODEP_CPP_CUBIT_=\ "..\..\..\..\tao\tao\factories.h"\
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitS.h"
+"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitS.h"\
+ ".\cubitC.h" ".\cubitC.i" ".\cubitS.i"
!ELSEIF "$(CFG)" == "server - Win32 Debug"
DEP_CPP_CUBIT_=\
".\cubit_i.h"\
+ ".\cubitC.h"\
+ ".\cubitC.i"\
".\cubitS.h"\
+ ".\cubitS.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
{$(INCLUDE)}"\ace\ACE.h"\
+ {$(INCLUDE)}"\ace\ACE.i"\
{$(INCLUDE)}"\ace\Addr.h"\
{$(INCLUDE)}"\ace\Addr.i"\
{$(INCLUDE)}"\ace\Atomic_Op.i"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.h"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.i"\
{$(INCLUDE)}"\ace\config-win32-common.h"\
{$(INCLUDE)}"\ace\config-win32.h"\
{$(INCLUDE)}"\ace\config.h"\
@@ -1396,6 +1439,7 @@ DEP_CPP_CUBIT_=\ {$(INCLUDE)}"\ace\Free_List.h"\
{$(INCLUDE)}"\ace\Free_List.i"\
{$(INCLUDE)}"\ace\Get_Opt.h"\
+ {$(INCLUDE)}"\ace\Get_Opt.i"\
{$(INCLUDE)}"\ace\Handle_Set.h"\
{$(INCLUDE)}"\ace\Handle_Set.i"\
{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\
@@ -1414,6 +1458,9 @@ DEP_CPP_CUBIT_=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\
{$(INCLUDE)}"\ace\Malloc_T.h"\
{$(INCLUDE)}"\ace\Malloc_T.i"\
+ {$(INCLUDE)}"\ace\Managed_Object.cpp"\
+ {$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -1430,7 +1477,9 @@ DEP_CPP_CUBIT_=\ {$(INCLUDE)}"\ace\Module.h"\
{$(INCLUDE)}"\ace\Module.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
+ {$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\Reactor.h"\
{$(INCLUDE)}"\ace\Reactor.i"\
{$(INCLUDE)}"\ace\Reactor_Impl.h"\
@@ -1497,6 +1546,7 @@ DEP_CPP_CUBIT_=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\Version.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -1560,7 +1610,8 @@ NODEP_CPP_CUBIT_=\ "..\..\..\..\tao\tao\factories.h"\
-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitS.h"
+"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitS.h"\
+ ".\cubitC.h" ".\cubitC.i" ".\cubitS.i"
!ENDIF
@@ -1790,9 +1841,13 @@ DEP_CPP_CUBITC=\ {$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
{$(INCLUDE)}"\ace\ACE.h"\
+ {$(INCLUDE)}"\ace\ACE.i"\
{$(INCLUDE)}"\ace\Addr.h"\
{$(INCLUDE)}"\ace\Addr.i"\
{$(INCLUDE)}"\ace\Atomic_Op.i"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.cpp"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.h"\
+ {$(INCLUDE)}"\ace\Auto_Ptr.i"\
{$(INCLUDE)}"\ace\config-win32-common.h"\
{$(INCLUDE)}"\ace\config-win32.h"\
{$(INCLUDE)}"\ace\config.h"\
@@ -1812,6 +1867,7 @@ DEP_CPP_CUBITC=\ {$(INCLUDE)}"\ace\Free_List.h"\
{$(INCLUDE)}"\ace\Free_List.i"\
{$(INCLUDE)}"\ace\Get_Opt.h"\
+ {$(INCLUDE)}"\ace\Get_Opt.i"\
{$(INCLUDE)}"\ace\Handle_Set.h"\
{$(INCLUDE)}"\ace\Handle_Set.i"\
{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\
@@ -1830,6 +1886,9 @@ DEP_CPP_CUBITC=\ {$(INCLUDE)}"\ace\Malloc_T.cpp"\
{$(INCLUDE)}"\ace\Malloc_T.h"\
{$(INCLUDE)}"\ace\Malloc_T.i"\
+ {$(INCLUDE)}"\ace\Managed_Object.cpp"\
+ {$(INCLUDE)}"\ace\Managed_Object.h"\
+ {$(INCLUDE)}"\ace\Managed_Object.i"\
{$(INCLUDE)}"\ace\Map_Manager.cpp"\
{$(INCLUDE)}"\ace\Map_Manager.h"\
{$(INCLUDE)}"\ace\Map_Manager.i"\
@@ -1846,7 +1905,9 @@ DEP_CPP_CUBITC=\ {$(INCLUDE)}"\ace\Module.h"\
{$(INCLUDE)}"\ace\Module.i"\
{$(INCLUDE)}"\ace\Object_Manager.h"\
+ {$(INCLUDE)}"\ace\Object_Manager.i"\
{$(INCLUDE)}"\ace\OS.h"\
+ {$(INCLUDE)}"\ace\OS.i"\
{$(INCLUDE)}"\ace\Reactor.h"\
{$(INCLUDE)}"\ace\Reactor.i"\
{$(INCLUDE)}"\ace\Reactor_Impl.h"\
@@ -1913,6 +1974,7 @@ DEP_CPP_CUBITC=\ {$(INCLUDE)}"\ace\Timer_Queue_T.h"\
{$(INCLUDE)}"\ace\Timer_Queue_T.i"\
{$(INCLUDE)}"\ace\Trace.h"\
+ {$(INCLUDE)}"\ace\Version.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.h"\
{$(INCLUDE)}"\ace\WFMO_Reactor.i"\
{$(INCLUDE)}"\ace\ws2tcpip.h"\
@@ -2071,6 +2133,7 @@ SOURCE=.\clnt.cpp DEP_CPP_CLNT_=\
".\clnt.h"\
".\cubitC.h"\
+ ".\cubitC.i"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
{$(INCLUDE)}"\ace\Acceptor.i"\
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp Binary files differindex 88779b2c878..b1760361b5e 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp diff --git a/ace/ACE_Library.mdp b/ace/ACE_Library.mdp Binary files differindex 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. diff --git a/tests/tests.mak b/tests/tests.mak index 5bc6e8ff248..3648b451fc9 100644 --- a/tests/tests.mak +++ b/tests/tests.mak @@ -4619,6 +4619,7 @@ DEP_CPP_TASK_=\ SOURCE=.\Thread_Manager_Test.cpp
DEP_CPP_THREA=\
+ ".\Thread_Manager_Test.h"\
{$(INCLUDE)}"\.\test_config.h"\
{$(INCLUDE)}"\ace\ACE.h"\
{$(INCLUDE)}"\ace\ACE.i"\
@@ -7455,6 +7456,7 @@ DEP_CPP_PRIORIT=\ SOURCE=.\Reactor_Performance_Test.cpp
DEP_CPP_REACTOR_P=\
+ ".\Reactor_Performance_Test.h"\
{$(INCLUDE)}"\.\test_config.h"\
{$(INCLUDE)}"\ace\Acceptor.cpp"\
{$(INCLUDE)}"\ace\Acceptor.h"\
diff --git a/tests/tests.mdp b/tests/tests.mdp Binary files differindex 3f9b2f94ad8..91a152f6831 100644 --- a/tests/tests.mdp +++ b/tests/tests.mdp |