diff options
| author | msmit <msmit@remedy.nl> | 2009-03-05 07:41:07 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-03-05 07:41:07 +0000 |
| commit | e7cfbeb6d5b7efb3c8194822743889eb8cc87ffb (patch) | |
| tree | 0f4a8bf789ea1a972242c44e624a1a7368bcccf2 /TAO/tests/Bug_3553_Regression | |
| parent | 90b96e68a1108ac985ae8bdfc76006735c23a1dc (diff) | |
| download | ATCD-e7cfbeb6d5b7efb3c8194822743889eb8cc87ffb.tar.gz | |
Thu Mar 5 07:36:08 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tao/GIOP_Message_Base.cpp
* tao/GIOP_Message_Base.h
* tao/ZIOP/ZIOP.cpp
* tao/ZIOP/ZIOP.h
* tao/ZIOP_Adapter.h
Reverted last changes.
Resolved memory leak and assert error during
release of an ACE_Data_Block.
* tao/Transport.cpp
No need to set read write pointer correctly. ZIOP
is responsible for that.
* tests/ZIOP/client.cpp
Enabled all tests again
* tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp
* tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp
Reverted last changes. Compiler errors should be resolved.
Diffstat (limited to 'TAO/tests/Bug_3553_Regression')
| -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 | 2 |
2 files changed, 3 insertions, 3 deletions
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 f78d84d68da..d5436579efa 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) { - char* object_string (""); - char* reference_string (""); + ACE_TCHAR* object_string (ACE_TEXT ("")); + ACE_TCHAR* reference_string (ACE_TEXT ("")); 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 563cbd3a08a..527a1d1f1e2 100644 --- a/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp +++ b/TAO/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp @@ -76,7 +76,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) 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"), i, ior_string.in ())); - char* identifier (""); + ACE_TCHAR* identifier (ACE_TEXT ("")); ACE_OS::sprintf (identifier, ACE_TEXT ("TransportCacheTest%d"), i); table->bind(identifier, ior_string.in()); } |