diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-06 19:49:58 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-06 19:49:58 +0000 |
commit | 357a1edcee93634510deef0094e97efce0400756 (patch) | |
tree | 426b0c310d2be25c28427106d1c87f929873830b | |
parent | 5d79e2fb2063024d1fbdcee31760ba59b31f85ef (diff) | |
download | ATCD-357a1edcee93634510deef0094e97efce0400756.tar.gz |
Fri Mar 6 19:49:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_3553_Regression/Bug_3553_Regression.mpc:
* tests/Bug_3553_Regression/TransportCache.mpc:
Renamed mpc file
* tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp:
* tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp:
Fixed compile errors/warnings
-rw-r--r-- | TAO/ChangeLog | 10 | ||||
-rw-r--r-- | TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc (renamed from TAO/tests/Bug_3553_Regression/TransportCache.mpc) | 0 | ||||
-rw-r--r-- | TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp | 4 | ||||
-rw-r--r-- | TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp | 6 |
4 files changed, 15 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c05160969bb..523ea2693bd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Mar 6 19:49:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Bug_3553_Regression/Bug_3553_Regression.mpc: + * tests/Bug_3553_Regression/TransportCache.mpc: + Renamed mpc file + + * tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp: + * tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp: + Fixed compile errors/warnings + Fri Mar 6 18:53:08 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tao/RTPortableServer.mpc: diff --git a/TAO/tests/Bug_3553_Regression/TransportCache.mpc b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc index 07de8983ed3..07de8983ed3 100644 --- a/TAO/tests/Bug_3553_Regression/TransportCache.mpc +++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression.mpc diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp index d5436579efa..4e8556742ed 100644 --- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp +++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp @@ -78,8 +78,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int iter = 1; for (iter = 1; iter <= cache_size; ++iter) { - ACE_TCHAR* object_string (ACE_TEXT ("")); - ACE_TCHAR* reference_string (ACE_TEXT ("")); + char object_string[256]; + char reference_string[256]; ACE_OS::sprintf (reference_string, "TransportCacheTest%d", iter); ACE_OS::sprintf (object_string, "corbaloc:iiop:localhost:%d/", port_nr); ACE_OS::strcat (object_string, reference_string); diff --git a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp index 527a1d1f1e2..4341198321e 100644 --- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp +++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp @@ -74,10 +74,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (int i = 1; i <= cache_size; ++i) { CORBA::String_var ior_string = orb->object_to_string (object.in()); - ACE_DEBUG((LM_DEBUG, ACE_TEXT("Registring object %d with IOR string: %C\n"), + ACE_DEBUG((LM_DEBUG, ACE_TEXT("Registering object %d with IOR string: %C\n"), i, ior_string.in ())); - ACE_TCHAR* identifier (ACE_TEXT ("")); - ACE_OS::sprintf (identifier, ACE_TEXT ("TransportCacheTest%d"), i); + char identifier[256]; + ACE_OS::sprintf (identifier, "TransportCacheTest%d", i); table->bind(identifier, ior_string.in()); } |