diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-04-30 14:25:48 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-04-30 14:25:48 +0000 |
| commit | 16bc3b98e49fba3c2efbf4c36e81d1a4970fe3ca (patch) | |
| tree | 77813fda2f9a24a2fe4b27ffb420188b654b4cb7 /TAO | |
| parent | 14d686a6f00dafbfa00d8cdf54ec6dd4c538fbe7 (diff) | |
| download | ATCD-16bc3b98e49fba3c2efbf4c36e81d1a4970fe3ca.tar.gz | |
ChangeLog tag: Sun Apr 30 14:24:20 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Profile_Transport_Resolver.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 809531ee0d2..7895ddb8cd5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Sun Apr 30 14:24:20 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * TAO/tao/Profile_Transport_Resolver.cpp: + Removed invalid semicolons. + + * TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc: + Fixed the dynamic flag for windows builds. + Sun Apr 30 04:54:25 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * tests/ORB_Local_Config/Bug_1459/Test.cpp: diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 8f87bb6f619..81d3a67f52d 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -128,7 +128,7 @@ namespace TAO ) { return this->try_connect_i (desc,max_time_value,0 ACE_ENV_ARG_PARAMETER); - }; + } bool Profile_Transport_Resolver::try_parallel_connect ( @@ -138,7 +138,7 @@ namespace TAO ) { return this->try_connect_i (desc,max_time_value,1 ACE_ENV_ARG_PARAMETER); - }; + } bool diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc index 636f83716aa..72987252c45 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc @@ -3,7 +3,7 @@ project(ORB DLL Server) : taolib_with_idl { sharedname = ORB_DLL_Server - dynamicflags = ORB_DLL_BUILD_DLL + dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL IDL_Files { Test.idl @@ -27,7 +27,7 @@ project(ORB DLL Server) : taolib_with_idl { project(ORB DLL Client) : taolib_with_idl { sharedname = ORB_DLL_Client - dynamicflags = ORB_DLL_BUILD_DLL + dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL IDL_Files { Test.idl @@ -58,6 +58,3 @@ project(*) : ../../../tests/acetest, taoserver { Test.cpp } } - - - |