diff options
39 files changed, 244 insertions, 202 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c0572ddb18f..9ef3b035621 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,45 @@ +Sun Oct 12 23:06:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Abstract_Interface/client.cpp + * tests/Bug_1254_Regression/server.cpp + * tests/Bug_2134_Regression/Hello.cpp + * tests/Bug_2234_Regression/client.cpp + * tests/Bug_2234_Regression/server.cpp + * tests/Bug_3276_Regression/Manager.cpp + * tests/CDR/octet_sequence.cpp + * tests/CDR/tc.cpp + * tests/CodeSets/simple/client.cpp + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp + * tests/HandleExhaustion/server.cpp + * tests/InterOp-Naming/INS_test_client.cpp + * tests/NestedUpcall/Simple/server.cpp + * tests/OBV/Truncatable/client.cpp + * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp + * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp + * tests/ORT/server.cpp + * tests/Param_Test/anyop.cpp + * tests/POA/Adapter_Activator/server.cpp + * tests/POA/Default_Servant2/client.cpp + * tests/POA/Default_Servant2/server.cpp + * tests/POA/Explicit_Activation/server.cpp + * tests/POA/Generic_Servant/client.cpp + * tests/POA/NewPOA/NewPOA.cpp + * tests/POA/On_Demand_Loading/Server_Manager.cpp + * tests/POA/Persistent_ID/server.cpp + * tests/POA/POA_BiDir/POA_BiDir.cpp + * tests/POA/POAManagerFactory/POAManagerFactory.cpp + * tests/RTCORBA/Linear_Priority/client.cpp + * tests/RTCORBA/Linear_Priority/server.cpp + * tests/RTCORBA/Persistent_IOR/server.cpp + * tests/RTCORBA/Policy_Combinations/client.cpp + * tests/RTCORBA/Policy_Combinations/server.cpp + * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp + * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp + * tests/Smart_Proxies/dtor/server.cpp + * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp + * tests/TransportCurrent/IIOP/IIOP_Tester.cpp + ACE_TCHAR fixes + Sun Oct 12 20:53:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Acceptor_Registry.cpp diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp index e0ee9d9cce1..8660e7678a1 100644 --- a/TAO/tests/Abstract_Interface/client.cpp +++ b/TAO/tests/Abstract_Interface/client.cpp @@ -75,9 +75,9 @@ dump_node (BaseNode* bn, int indent) { if (sn != 0) { - ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n", + ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %C\n", bn, - ACE_TEXT_CHAR_TO_TCHAR (sn->name ()))); + sn->name ())); } else { @@ -130,8 +130,8 @@ test_operation (base_ptr abs) if (debug) { ACE_DEBUG ((LM_DEBUG, - "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (retval.in ()))); + "%C\n", + retval.in ())); } CORBA::Object_var obj = abs->_to_object (); @@ -143,8 +143,8 @@ test_operation (base_ptr abs) if (debug) { ACE_DEBUG ((LM_DEBUG, - "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (retval.in ()))); + "%C\n", + retval.in ())); } retval = concrete->base_op ("base_op"); @@ -152,8 +152,8 @@ test_operation (base_ptr abs) if (debug) { ACE_DEBUG ((LM_DEBUG, - "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (retval.in ()))); + "%C\n", + retval.in ())); } } @@ -167,8 +167,8 @@ test_exception (base_ptr abs) if (debug) { ACE_DEBUG ((LM_DEBUG, - "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (retval.in ()))); + "%C\n", + retval.in ())); } } catch (const BadInput& ex) @@ -176,8 +176,8 @@ test_exception (base_ptr abs) if (debug) { ACE_DEBUG ((LM_DEBUG, - "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (ex.message.in ()))); + "%C\n", + ex.message.in ())); } } } diff --git a/TAO/tests/Bug_1254_Regression/server.cpp b/TAO/tests/Bug_1254_Regression/server.cpp index 11d574a22ae..e69ea65aaa5 100644 --- a/TAO/tests/Bug_1254_Regression/server.cpp +++ b/TAO/tests/Bug_1254_Regression/server.cpp @@ -82,7 +82,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "Cannot open output file for writing IOR: %s", ior_output_file), 1); - ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); + ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); poa_manager->activate (); diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp index 5eef8d2f265..6a7abe0399e 100644 --- a/TAO/tests/Bug_2134_Regression/Hello.cpp +++ b/TAO/tests/Bug_2134_Regression/Hello.cpp @@ -56,7 +56,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) iorTable->bind("hello", ior_string.in ()); - ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ACE_TEXT_CHAR_TO_TCHAR (ior_string.in ()))); + ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%C\n", ior_string.in ())); // Activate the POA manager PortableServer::POAManager_var poaManager = rootPOA->the_POAManager (); @@ -74,7 +74,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) friendly_corbaloc += "/hello"; - ACE_DEBUG ((LM_DEBUG, "Trying to access object with object ref:\n%s\n", ACE_TEXT_CHAR_TO_TCHAR (friendly_corbaloc.c_str ()))); + ACE_DEBUG ((LM_DEBUG, "Trying to access object with object ref:\n%C\n", friendly_corbaloc.c_str ())); CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ()); diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp index e989a7bd2ab..4bdc84d1bdc 100644 --- a/TAO/tests/Bug_2234_Regression/client.cpp +++ b/TAO/tests/Bug_2234_Regression/client.cpp @@ -52,7 +52,7 @@ ACE_TMAIN ( rS; ACE_DEBUG( (LM_INFO, ". String() ") ); rS= foo->TestString( aS.in(), bS.out(), cS.inout()); - ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s: ", ACE_TEXT_CHAR_TO_TCHAR (aS.in ()), ACE_TEXT_CHAR_TO_TCHAR (bS.in ()), ACE_TEXT_CHAR_TO_TCHAR (cS.in ()), ACE_TEXT_CHAR_TO_TCHAR (rS.in ())) ); + ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C: ", aS.in (), bS.in (), cS.in (), rS.in ())); if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(bS.in(), "2"))) { @@ -96,7 +96,7 @@ ACE_TMAIN ( cVS->val= CORBA::string_dup("3"); ACE_DEBUG( (LM_INFO, ". MyVarStruct() ") ); rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout()); - ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s: ", ACE_TEXT_CHAR_TO_TCHAR (aVS->val.in()), ACE_TEXT_CHAR_TO_TCHAR (bVS->val.in ()), ACE_TEXT_CHAR_TO_TCHAR (cVS->val.in ()), ACE_TEXT_CHAR_TO_TCHAR (rVS->val.in ())) ); + ACE_DEBUG( (LM_INFO, "a is %C, b is %C, c is %C, r is %C: ", aVS->val.in(), bVS->val.in (), cVS->val.in (), rVS->val.in ())); if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) { ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;} else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) { diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp index 7ce254f6a8d..d4f8d5b598a 100644 --- a/TAO/tests/Bug_2234_Regression/server.cpp +++ b/TAO/tests/Bug_2234_Regression/server.cpp @@ -597,7 +597,7 @@ public: break; case 2: - ACE_DEBUG( (LM_INFO, "String %s", ACE_TEXT_CHAR_TO_TCHAR (vU->valString())) ); + ACE_DEBUG( (LM_INFO, "String %C", vU->valString())); break; default: @@ -648,7 +648,7 @@ public: else if (arg >>= CORBA::Any::to_object(obj)) { ACE_DEBUG( (LM_INFO, "CORBA::Object (") ); - } + } else ACE_DEBUG( (LM_INFO, "Unknown (") ); ACE_DEBUG( (LM_INFO, ") parameter\n") ); diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp index a4e486e9657..0e9d95e5df4 100644 --- a/TAO/tests/Bug_3276_Regression/Manager.cpp +++ b/TAO/tests/Bug_3276_Regression/Manager.cpp @@ -64,7 +64,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "Cannot open output file for writing IOR: %s", proxy_ior), 1); - ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); + ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } @@ -76,7 +76,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ior = orb->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ACE_TEXT_CHAR_TO_TCHAR (ior.in ()))); + ACE_DEBUG ((LM_DEBUG, "Activated as <%C>\n", ior.in ())); // If the proxy_ior exists, output the ior to it if (control_ior != 0) @@ -90,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "Cannot open output file for writing IOR: %s", control_ior), 1); - ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); + ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp index 96428b5ce3d..8518aec1aec 100644 --- a/TAO/tests/CDR/octet_sequence.cpp +++ b/TAO/tests/CDR/octet_sequence.cpp @@ -30,11 +30,11 @@ ACE_Message_Block * m3; void dump (const char * msg) { ACE_DEBUG ((LM_INFO, - "%s\n" + "%C\n" "m1: %d\n" "m2: %d\n" "m3: %d\n", - ACE_TEXT_CHAR_TO_TCHAR (msg), + msg, m1->data_block()->reference_count(), m2->data_block()->reference_count(), m3->data_block()->reference_count())); diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 5dd9249d07e..5d54012c4af 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -129,13 +129,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "ID = '%s'\n" - "%{%{ NAME = %s%$" + "ID = '%C'\n" + "%{%{ NAME = %C%$" " KIND = %d%$" " LENGTH = %d" "%}%}\n", - ACE_TEXT_CHAR_TO_TCHAR ((id?id:"empty ID")), - ACE_TEXT_CHAR_TO_TCHAR ((name?name:"empty name")), + (id?id:"empty ID"), + (name?name:"empty name"), k, length)); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp index b1544a4ead3..394c63527f5 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -83,9 +83,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file %s for writing IOR: %s", + "Cannot open output file %s for writing IOR: %C", ior_output_file, - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp index c83d13989a9..36d0293e1e7 100644 --- a/TAO/tests/CodeSets/simple/client.cpp +++ b/TAO/tests/CodeSets/simple/client.cpp @@ -36,7 +36,7 @@ make_wstring (const char *str) size_t len = ACE_OS::strlen (str) + 1; wchar_t *wstr = new wchar_t[len]; ACE_DEBUG ((LM_DEBUG, - "make_wstring: str = %s\n", ACE_TEXT_CHAR_TO_TCHAR (str))); + "make_wstring: str = %C\n", str)); for (size_t i = 0; i < len; i++) { char *t = const_cast<char *> (str); @@ -94,7 +94,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) outarg >>= any_reply; ACE_DEBUG ((LM_DEBUG, - "Client sent %s, got %s\n", ACE_TEXT_CHAR_TO_TCHAR (bare_string), ACE_TEXT_CHAR_TO_TCHAR (reply.in ()) )); + "Client sent %C, got %C\n", bare_string, reply.in ()) ); if (ACE_OS::strcmp (bare_string, reply.in ()) != 0) { @@ -102,7 +102,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - "Client sent %s, got %s\n", ACE_TEXT_CHAR_TO_TCHAR (any_string), ACE_TEXT_CHAR_TO_TCHAR (any_reply) )); + "Client sent %C, got %C\n", any_string, any_reply) ); if (ACE_OS::strcmp (any_string, any_reply) != 0) { diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp index c59730ba456..ed32e842ad7 100644 --- a/TAO/tests/HandleExhaustion/server.cpp +++ b/TAO/tests/HandleExhaustion/server.cpp @@ -170,9 +170,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file %s for writing IOR: %s\n", + "Cannot open output file %s for writing IOR: %C\n", ior_output_file, - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index 9014f6b8bab..dbb42b3c982 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -45,9 +45,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) for (CORBA::ULong n = 0; n < length; ++n) { ACE_DEBUG ((LM_DEBUG, - " Reference %u: %s\n", + " Reference %u: %C\n", n, - ACE_TEXT_CHAR_TO_TCHAR (static_cast<char const*>(list[n])))); + static_cast<char const*>(list[n]))); } } else @@ -76,16 +76,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var iorstr = orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, - "Resolved IOR for %s : %s\n", + "Resolved IOR for %s : %C\n", argv[i], - ACE_TEXT_CHAR_TO_TCHAR (iorstr.in()))); + iorstr.in())); CORBA::String_var test_ins_result = server->test_ins (); ACE_DEBUG ((LM_DEBUG, - "\nResult of Remote Call : %s\n", - ACE_TEXT_CHAR_TO_TCHAR (test_ins_result.in ()))); + "\nResult of Remote Call : %C\n", + test_ins_result.in ())); } } } diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 83a12c86a51..2fceb937b1f 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -62,8 +62,8 @@ write_ior_to_file (const char *ior) if (result < 0 || static_cast<size_t> (result) != ACE_OS::strlen (ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior), + "ACE_OS::fprintf failed while writing %C to %s\n", + ior, ior_file), -1); diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp index aed77f06b8d..a9e9359b692 100644 --- a/TAO/tests/OBV/Truncatable/client.cpp +++ b/TAO/tests/OBV/Truncatable/client.cpp @@ -160,8 +160,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB, truncate B to A"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 1: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 1: %C: "), + desc.in())); pretest = fail; test->op1 ("case1", &v1, ov1.out (), desc.inout ()); @@ -186,8 +186,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) OBV_TruncatableTest::BaseValue_var ov2; desc = CORBA::string_dup ("A<-tB<-tC, truncate C to A"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 2: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 2: %C: "), + desc.in())); pretest = fail; test->op1 ("case2", &v2, ov2.out (), desc.inout ()); @@ -203,8 +203,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) OBV_TruncatableTest::TValue1_var otv1; desc = CORBA::string_dup ("A<-tB<-tC, truncate C to B"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3: %C: "), + desc.in())); pretest = fail; test->op2 (&v2, "case3", otv1.out (), desc.inout ()); @@ -227,8 +227,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) OBV_TruncatableTest::TValue1_var otv1b; desc = CORBA::string_dup ("A<-tB, truncatable but no truncation"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3b: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 3b: %C: "), + desc.in())); pretest = fail; test->op2 (&itv1b, "case3b", otv1b.out (), desc.inout ()); @@ -256,8 +256,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB<-C, try truncate C to A, MARSHAL exception"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 4: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 4: %C: "), + desc.in())); test->op1 ("case4", &v3, ov3.out (), desc.inout ()); } catch (const CORBA::MARSHAL&) @@ -293,8 +293,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB<-tC, B & C have nested value type, truncate C to A"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 5: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 5: %C: "), + desc.in())); pretest = fail; test->op1 ("case5", &v5, ov5.out (), desc.inout ()); @@ -310,8 +310,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB<-tC, B & C have nested value type, truncate C to B"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 6: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 6: %C: "), + desc.in())); pretest = fail; test->op3 ("case6", &v5, otv4.out (), desc.inout ()); @@ -333,8 +333,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB, B has no data, truncate B to A"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 7: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 7: %C: "), + desc.in())); pretest = fail; test->op1 ("case7", &iv, ov.out (), desc.inout ()); @@ -374,8 +374,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ("multiple IN truncatable valuetype parameters" " and return truncatable valuetype"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 8: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 8: %C: "), + desc.in())); pretest = fail; OBV_TruncatableTest::BaseValue_var ov = test->op4 ("case8", &v1, 5, &v2, &v3, &v4, desc.inout ()); @@ -402,8 +402,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) desc = CORBA::string_dup ("A<-tB, truncate unknown B to A"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 9: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 9: %C: "), + desc.in())); pretest = fail; test->op2 (&v1, "case9", ov1.out (), desc.inout ()); @@ -430,8 +430,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) a <<= &v1; desc = CORBA::string_dup ("A<-tB, known truncatable via Any"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 10: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 10: %C: "), + desc.in())); pretest = fail; test->op5 (a, "case10", ov1.out (), desc.inout ()); @@ -458,8 +458,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) a <<= &v1; desc = CORBA::string_dup ("A<-tB, unknown truncatable via Any"); if (verbose) - ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 11: %s: "), - ACE_TEXT_CHAR_TO_TCHAR(desc.in()))); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT("Case 11: %C: "), + desc.in())); pretest = fail; test->op5 (a, "case11", ov1.out (), desc.inout ()); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index bbcce9e430c..82371609cb3 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -91,8 +91,8 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[]) hello->get_string (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) String returned from the server <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR (the_string.in ()))); + ACE_TEXT ("(%P|%t) String returned from the server <%C>\n"), + the_string.in ())); hello->shutdown (); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index a716473f3c9..8f2f1ada5ab 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -104,9 +104,9 @@ Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) FILE *output_file= ACE_OS::fopen (ior_file_.c_str (), "w"); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %s"), + ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %C"), ior_file_.c_str (), - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp index f1aa8d0aba0..a340cfb774a 100644 --- a/TAO/tests/ORT/server.cpp +++ b/TAO/tests/ORT/server.cpp @@ -121,9 +121,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file %s for writing " - "IOR: %s", + "IOR: %C", ior_output_file, - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/POA/Adapter_Activator/server.cpp b/TAO/tests/POA/Adapter_Activator/server.cpp index 76a34990e3d..bafc4565c0a 100644 --- a/TAO/tests/POA/Adapter_Activator/server.cpp +++ b/TAO/tests/POA/Adapter_Activator/server.cpp @@ -183,25 +183,25 @@ write_iors_to_file (const char *first_ior, const char *second_ior, const char *third_ior) { - char ior_output_file_1[BUFSIZ]; - char ior_output_file_2[BUFSIZ]; - char ior_output_file_3[BUFSIZ]; + ACE_TCHAR ior_output_file_1[BUFSIZ]; + ACE_TCHAR ior_output_file_2[BUFSIZ]; + ACE_TCHAR ior_output_file_3[BUFSIZ]; - ACE_OS::sprintf (ior_output_file_1, "%s_1", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); - ACE_OS::sprintf (ior_output_file_2, "%s_2", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); - ACE_OS::sprintf (ior_output_file_3, "%s_3", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); + ACE_OS::sprintf (ior_output_file_1, ACE_TEXT("%s_1"), ior_output_file); + ACE_OS::sprintf (ior_output_file_2, ACE_TEXT("%s_2"), ior_output_file); + ACE_OS::sprintf (ior_output_file_3, ACE_TEXT("%s_3"), ior_output_file); - FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); - FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); - FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w"); + FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w")); + FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w")); + FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w")); if (output_file_1 == 0 || output_file_2 == 0 || output_file_3 == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_3)), + ior_output_file_1, + ior_output_file_2, + ior_output_file_3), -1); u_int result = 0; @@ -211,9 +211,9 @@ write_iors_to_file (const char *first_ior, first_ior); if (result != ACE_OS::strlen (first_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)), + "ACE_OS::fprintf failed while writing %C to %s\n", + first_ior, + ior_output_file_1), -1); result = ACE_OS::fprintf (output_file_2, @@ -221,9 +221,9 @@ write_iors_to_file (const char *first_ior, second_ior); if (result != ACE_OS::strlen (second_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (second_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), + "ACE_OS::fprintf failed while writing %C to %s\n", + second_ior, + ior_output_file_2), -1); result = ACE_OS::fprintf (output_file_3, @@ -231,9 +231,9 @@ write_iors_to_file (const char *first_ior, third_ior); if (result != ACE_OS::strlen (third_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (third_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_3)), + "ACE_OS::fprintf failed while writing %C to %s\n", + third_ior, + ior_output_file_3), -1); ACE_OS::fclose (output_file_1); @@ -353,10 +353,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->object_to_string (third_test.in ()); ACE_DEBUG ((LM_DEBUG, - "%s\n%s\n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_ior.in ()), - ACE_TEXT_CHAR_TO_TCHAR (second_ior.in ()), - ACE_TEXT_CHAR_TO_TCHAR (third_ior.in ()))); + "%C\n%C\n%C\n", + first_ior.in (), + second_ior.in (), + third_ior.in ())); int write_result = write_iors_to_file (first_ior.in (), second_ior.in (), diff --git a/TAO/tests/POA/Default_Servant2/client.cpp b/TAO/tests/POA/Default_Servant2/client.cpp index 45f46777f93..2140127120a 100644 --- a/TAO/tests/POA/Default_Servant2/client.cpp +++ b/TAO/tests/POA/Default_Servant2/client.cpp @@ -130,8 +130,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) char *result = (char *) &data_received[0]; // print the read message - ACE_DEBUG((LM_DEBUG, "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (result))); + ACE_DEBUG((LM_DEBUG, "%C\n", + result)); // close the file fd->destroy (); diff --git a/TAO/tests/POA/Default_Servant2/server.cpp b/TAO/tests/POA/Default_Servant2/server.cpp index bfe90fe06c1..53cf482e0a9 100644 --- a/TAO/tests/POA/Default_Servant2/server.cpp +++ b/TAO/tests/POA/Default_Servant2/server.cpp @@ -129,8 +129,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var file_system_ior = orb->object_to_string (file_system.in ()); - ACE_DEBUG ((LM_DEBUG, "%s\n", - ACE_TEXT_CHAR_TO_TCHAR (file_system_ior.in ()))); + ACE_DEBUG ((LM_DEBUG, "%C\n", + file_system_ior.in ())); FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); if (output_file == 0) diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp index e08f41878ff..42c2663520b 100644 --- a/TAO/tests/POA/Explicit_Activation/server.cpp +++ b/TAO/tests/POA/Explicit_Activation/server.cpp @@ -57,13 +57,13 @@ write_iors_to_file (const char *first_ior, const char *second_ior, const char *third_ior) { - char ior_output_file_1[BUFSIZ]; - char ior_output_file_2[BUFSIZ]; - char ior_output_file_3[BUFSIZ]; + ACE_TCHAR ior_output_file_1[BUFSIZ]; + ACE_TCHAR ior_output_file_2[BUFSIZ]; + ACE_TCHAR ior_output_file_3[BUFSIZ]; - ACE_OS::sprintf (ior_output_file_1, "%s_1", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); - ACE_OS::sprintf (ior_output_file_2, "%s_2", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); - ACE_OS::sprintf (ior_output_file_3, "%s_3", ACE_TEXT_ALWAYS_CHAR (ior_output_file)); + ACE_OS::sprintf (ior_output_file_1, ACE_TEXT("%s_1"), ior_output_file); + ACE_OS::sprintf (ior_output_file_2, ACE_TEXT("%s_2"), ior_output_file); + ACE_OS::sprintf (ior_output_file_3, ACE_TEXT("%s_3"), ior_output_file); FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w"); FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w"); @@ -73,9 +73,9 @@ write_iors_to_file (const char *first_ior, output_file_2 == 0 || output_file_3 == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_3)), + ior_output_file_1, + ior_output_file_2, + ior_output_file_3), -1); u_int result = 0; @@ -85,9 +85,9 @@ write_iors_to_file (const char *first_ior, first_ior); if (result != ACE_OS::strlen (first_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)), + "ACE_OS::fprintf failed while writing %C to %s\n", + first_ior, + ior_output_file_1), -1); result = ACE_OS::fprintf (output_file_2, @@ -95,9 +95,9 @@ write_iors_to_file (const char *first_ior, second_ior); if (result != ACE_OS::strlen (second_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (second_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), + "ACE_OS::fprintf failed while writing %C to %s\n", + second_ior, + ior_output_file_2), -1); result = ACE_OS::fprintf (output_file_3, @@ -105,9 +105,9 @@ write_iors_to_file (const char *first_ior, third_ior); if (result != ACE_OS::strlen (third_ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (third_ior), - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_3)), + "ACE_OS::fprintf failed while writing %C to %s\n", + third_ior, + ior_output_file_3), -1); ACE_OS::fclose (output_file_1); @@ -251,10 +251,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->object_to_string (third_test.in ()); ACE_DEBUG ((LM_DEBUG, - "%s\n%s\n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_ior.in ()), - ACE_TEXT_CHAR_TO_TCHAR (second_ior.in ()), - ACE_TEXT_CHAR_TO_TCHAR (third_ior.in ()))); + "%C\n%C\n%C\n", + first_ior.in (), + second_ior.in (), + third_ior.in ())); int write_result = write_iors_to_file (first_ior.in (), diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp index 80e9929e23c..f90e4bf7db1 100644 --- a/TAO/tests/POA/Generic_Servant/client.cpp +++ b/TAO/tests/POA/Generic_Servant/client.cpp @@ -131,8 +131,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->object_to_string (test.in ()); ACE_DEBUG ((LM_DEBUG, - "\nConnecting to: %s\n\n", - ACE_TEXT_CHAR_TO_TCHAR (ior.in ()))); + "\nConnecting to: %C\n\n", + ior.in ())); ACE_Profile_Timer timer; ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time; diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp index 161d90730d1..97ec819ccc3 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.cpp +++ b/TAO/tests/POA/NewPOA/NewPOA.cpp @@ -42,8 +42,8 @@ print_poa (PortableServer::POA_ptr poa) poa->id (); ACE_DEBUG ((LM_DEBUG, - "POA name = %s\n", - ACE_TEXT_CHAR_TO_TCHAR (poa_name.in ()))); + "POA name = %C\n", + poa_name.in ())); ACE_DEBUG ((LM_DEBUG, "POA id = ")); @@ -146,11 +146,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) third_poa->the_name (); ACE_DEBUG ((LM_DEBUG, - "%s\n%s\n%s\n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (root_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (first_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (second_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (third_poa_name.in ()))); + "%C\n%C\n%C\n%C\n", + root_poa_name.in (), + first_poa_name.in (), + second_poa_name.in (), + third_poa_name.in ())); print_poa (root_poa.in ()); diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp index 6b3ddb6c746..2fb19d905d3 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp @@ -321,9 +321,9 @@ Server_i::run (void) // Print the ior's of first_test and second_test. - ACE_DEBUG ((LM_DEBUG,"%s\n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (first_test_ior.in ()), - ACE_TEXT_CHAR_TO_TCHAR (second_test_ior.in ()))); + ACE_DEBUG ((LM_DEBUG,"%C\n%C\n", + first_test_ior.in (), + second_test_ior.in ())); int write_result = this->write_iors_to_file (first_test_ior.in (), diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 0d33159ce0f..2a94043c709 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -178,8 +178,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) = poa_manager_2->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Implicitly created POAManager's ID: [%s]\n"), - ACE_TEXT_CHAR_TO_TCHAR(poa_manager_2_name.in()))); + ACE_TEXT("Implicitly created POAManager's ID: [%C]\n"), + poa_manager_2_name.in())); if (ACE_OS::strlen(poa_manager_2_name.in()) == 0) return 1; @@ -204,8 +204,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::String_var name = managers[i]->get_id (); if (verbose) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("Validate listed POAManager [%s]: "), - ACE_TEXT_CHAR_TO_TCHAR(name.in()))); + ACE_TEXT("Validate listed POAManager [%C]: "), + name.in())); pretest = fail; const PortableServer::POAManager_ptr tmp_pm = managers[i]; diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp index 598eb6fe11f..2aaedd37c73 100644 --- a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp +++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp @@ -40,8 +40,8 @@ print_poa (PortableServer::POA_ptr poa) poa->id (); ACE_DEBUG ((LM_DEBUG, - "POA name = %s\n", - ACE_TEXT_CHAR_TO_TCHAR (poa_name.in ()))); + "POA name = %C\n", + poa_name.in ())); ACE_DEBUG ((LM_DEBUG, "POA id = ")); @@ -162,11 +162,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) third_poa->the_name (); ACE_DEBUG ((LM_DEBUG, - "%s\n%s\n%s\n%s\n", - ACE_TEXT_CHAR_TO_TCHAR (root_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (first_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (second_poa_name.in ()), - ACE_TEXT_CHAR_TO_TCHAR (third_poa_name.in ()))); + "%C\n%C\n%C\n%C\n", + root_poa_name.in (), + first_poa_name.in (), + second_poa_name.in (), + third_poa_name.in ())); print_poa (root_poa.in ()); diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 9f76e6882d6..158da5b4b00 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -73,8 +73,8 @@ test_i::method (void) poa->the_name (); ACE_DEBUG ((LM_DEBUG, - "Method invoked on servant in POA = %s\n", - ACE_TEXT_CHAR_TO_TCHAR (poa_name.in ()))); + "Method invoked on servant in POA = %C\n", + poa_name.in ())); } void @@ -198,8 +198,8 @@ write_ior_to_file (const char *ior) ior); if (result != ACE_OS::strlen (ior)) ACE_ERROR_RETURN ((LM_ERROR, - "ACE_OS::fprintf failed while writing %s to %s\n", - ACE_TEXT_CHAR_TO_TCHAR (ior), + "ACE_OS::fprintf failed while writing %C to %s\n", + ior, ior_file), -1); diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 787246863a4..04e391c457d 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -173,9 +173,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) char bufferi[32]; char buffero[32]; ACE_DEBUG ((LM_DEBUG, - "Failure for CORBA::ULongLong (%s,%s)\n", - ACE_TEXT_CHAR_TO_TCHAR (i.as_string (bufferi)), - ACE_TEXT_CHAR_TO_TCHAR (o.as_string (buffero)))); + "Failure for CORBA::ULongLong (%C,%C)\n", + i.as_string (bufferi), + o.as_string (buffero))); #else ACE_DEBUG ((LM_DEBUG, "Failure for CORBA::ULongLong (%Q,%Q)\n", @@ -244,9 +244,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) || ACE_OS::strcmp (i, o) != 0) { ACE_DEBUG ((LM_DEBUG, - "Failure for char* (%s,%s)\n", - ACE_TEXT_CHAR_TO_TCHAR (i), - ACE_TEXT_CHAR_TO_TCHAR (o))); + "Failure for char* (%C,%C)\n", + i, + o)); } } diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 2c75eb01c40..b6a4205ef61 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -325,10 +325,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 3cef0ac0c56..4f7e191bd66 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -294,10 +294,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index b225dc1d7c8..91acef426fa 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -127,9 +127,9 @@ write_iors_to_file (CORBA::Object_ptr object, if (debug) ACE_DEBUG ((LM_DEBUG, - "%s: %s\n", - ACE_TEXT_CHAR_TO_TCHAR (filename), - ACE_TEXT_CHAR_TO_TCHAR (ior.in ()))); + "%C: %C\n", + filename, + ior.in ())); u_int result = 0; result = diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 7804e2df749..e479d7fd306 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -170,10 +170,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 6897e0ca425..fb3743ca079 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -148,7 +148,7 @@ write_iors_to_file (CORBA::Object_ptr object, result = ACE_OS::fprintf (file, "%s", - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())); + ior.in ()); ACE_ASSERT (result == ACE_OS::strlen (ior.in ())); ACE_UNUSED_ARG (result); @@ -807,10 +807,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 73895391254..cacbf42673b 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -521,10 +521,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 96dd2facd0e..a5613fc4bdb 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -390,10 +390,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (errno == EPERM) { ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" + "Cannot create thread with scheduling policy %C\n" "because the user does not have the appropriate privileges, terminating program....\n" "Check svc.conf options and/or run as root\n", - ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))), + sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), 2); } else diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 4ce35015f54..582ba4179c1 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -103,9 +103,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file %s for writing IOR: %s", + "Cannot open output file %s for writing IOR: %C", ior_output_file, - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 6617ea443bd..a79c40b6eab 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -68,16 +68,16 @@ namespace Test { if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) ") + ACE_TEXT ("%C (%P|%t) ") ACE_TEXT ("push_request_info: %d ...\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), requestID)); } else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") + ACE_TEXT ("%C (%P|%t) ") ACE_TEXT ("push_request_info: Can't track that many requests %d\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), requestID)); } @@ -90,17 +90,17 @@ namespace Test { if (TAO_debug_level > 1) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) ") + ACE_TEXT ("%C (%P|%t) ") ACE_TEXT ("pop_request_info: %d ...\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), requestID)); if (requestID >= sizeof (this->endPoints_) / sizeof (*this->endPoints_)) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") + ACE_TEXT ("%C (%P|%t) ") ACE_TEXT ("pop_request_info: Can't track that many requests %d\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), requestID)); return; } @@ -116,9 +116,9 @@ namespace Test { if (ep != endPoints_[requestID]) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) ") + ACE_TEXT ("%C (%P|%t) ") ACE_TEXT ("pop_request_info: The expected host and port don't match for request %d\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), requestID)); return; } @@ -150,9 +150,9 @@ namespace Test { { has_remaining_endpoints = true; ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%s (%P|%t) Endpoint at ") + ACE_TEXT ("%C (%P|%t) Endpoint at ") ACE_TEXT ("index=%d has not been removed yet\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), count)); } } @@ -172,8 +172,8 @@ namespace Test { if (TAO_debug_level >=1) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("%s (%P|%t) Intercepted operation %s ()\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + ACE_TEXT("%C (%P|%t) Intercepted operation %s ()\n"), + name.in (), op.in ())); try @@ -192,11 +192,11 @@ namespace Test { catch (const CORBA::Exception&) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s (%P|%t) Service context") + ACE_TEXT ("%C (%P|%t) Service context") ACE_TEXT (" is unavailable when invoking %s (). ") ACE_TEXT ("A colocated invocation would have ") ACE_TEXT ("no service context.\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()), + name.in (), op.in ())); } @@ -232,9 +232,9 @@ namespace Test { { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Inbound_process_context failed in ") + ACE_TEXT("%C (%P|%t) Inbound_process_context failed in ") ACE_TEXT(" receive_request_service_contexts.\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + name.in ())); } Server_Request_Interceptor::receive_request_service_contexts (ri); @@ -254,9 +254,9 @@ namespace Test { { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") + ACE_TEXT("%C (%P|%t) Outbound_process_context failed in ") ACE_TEXT("send_reply.\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + name.in ())); } Server_Request_Interceptor::send_reply (ri); @@ -276,9 +276,9 @@ namespace Test { { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") + ACE_TEXT("%C (%P|%t) Outbound_process_context failed in ") ACE_TEXT("send_exception.\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + name.in ())); } @@ -296,9 +296,9 @@ namespace Test { { CORBA::String_var name (this->name ()); ACE_ERROR ((LM_ERROR, - ACE_TEXT("%s (%P|%t) Outbound_process_context failed in ") + ACE_TEXT("%C (%P|%t) Outbound_process_context failed in ") ACE_TEXT("send_other.\n"), - ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); + name.in ())); } Server_Request_Interceptor::send_other (ri); diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp index 357b2484a39..ef0901037c0 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp @@ -62,11 +62,11 @@ test_transport_current (CORBA::ORB_ptr orb) ::TAO::CounterT rr = tc->messages_received (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Tester (%P|%t) Transport [%q] [%s:%d -> %s:%d] ") + ACE_TEXT ("Tester (%P|%t) Transport [%q] [%C:%d -> %C:%d] ") ACE_TEXT ("Sent/Received [bytes=%q/%q, messages=%q/%q]\n"), (ACE_UINT64)id, - ACE_TEXT_CHAR_TO_TCHAR (rhost.in ()), tc->remote_port (), - ACE_TEXT_CHAR_TO_TCHAR (lhost.in ()), tc->local_port (), + rhost.in (), tc->remote_port (), + lhost.in (), tc->local_port (), (ACE_UINT64)bs, (ACE_UINT64)br, (ACE_UINT64)rs, |