From a9d7be95e8ffec9cf808aa25897b246aa4565cdf Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 6 Oct 2008 07:50:59 +0000 Subject: Mon Oct 6 07:45:45 UTC 2008 Johnny Willemsen --- TAO/ChangeLog | 10 +++++++++- TAO/tests/Bug_2319_Regression/server.cpp | 2 +- TAO/tests/IORManipulation/IORTest.cpp | 10 +++++----- TAO/tests/POA/Bug_1592_Regression/client.cpp | 1 - TAO/tests/POA/DSI/server.cpp | 2 +- TAO/tests/Policies/Manipulation.cpp | 1 - 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c62433f8d46..133f5cd539e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,18 @@ +Mon Oct 6 07:45:45 UTC 2008 Johnny Willemsen + + * tests/Bug_2319_Regression/server.cpp: + ACE_TCHAR fixes + + * tests/IORManipulation/IORTest.cpp: + Zap old workaround and return a correct return value + Fri Oct 3 19:25:29 UTC 2008 Phil Mesnier * orbsvcs/tests/Bug_3387_Regression/Messenger.mpc: Fix to avoid build problems on some platforms such as OpenMVS IA64. - + Fri Oct 3 11:08:45 UTC 2008 Johnny Willemsen * examples/Callback_Quoter/Consumer_Handler.cpp diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index a7fe1f6c960..12b6b25c5b3 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -241,7 +241,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var iorstr) { ACE_ERROR ((LM_ERROR, "Cannot open output file for writing IOR: %s", - ACE_TEXT_CHAR_TO_TCHAR (ST_AMH_Server::ior_output_file_))); + ST_AMH_Server::ior_output_file_)); return -1; } diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 25ba4c4b619..e4c598280ee 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -25,10 +25,7 @@ ACE_RCSID (IORManipluation, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // The variable is declared volatile because, some compilers - // optimizes this the wrong way. A case is point is the CC compiler - // on IRIX. - volatile int Status = 0; + int Status = 0; ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n")); @@ -270,7 +267,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Status = 0; } if (Status == 0) - ACE_DEBUG ((LM_DEBUG, "An ERROR occured during the tests!\n")); + { + ACE_DEBUG ((LM_DEBUG, "An ERROR occured during the tests!\n")); + return -1; + } else ACE_DEBUG ((LM_DEBUG, "IORManipulation Tests Successfully Completed!\n")); ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp index f4dc792261f..e6769492561 100644 --- a/TAO/tests/POA/Bug_1592_Regression/client.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/client.cpp @@ -2,7 +2,6 @@ #include "testC.h" - ACE_RCSID (ServantLocator, client, "$Id$") diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp index d4916be2bf9..2c7cd3880d8 100644 --- a/TAO/tests/POA/DSI/server.cpp +++ b/TAO/tests/POA/DSI/server.cpp @@ -21,7 +21,7 @@ ACE_RCSID(DSI, server, "$Id$") -static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); +static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior"); static int parse_args (int argc, ACE_TCHAR **argv) diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index c7f7d43d6c4..becfd63d8ef 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -299,7 +299,6 @@ Manipulation::svc (void) CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in ()); - for (int i = 0; i != this->niterations_; ++i) { CORBA::PolicyList_var policies; -- cgit v1.2.1