Tue Aug 24 14:26:36 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * interop-tests/wchar/client.cpp:
        * interop-tests/wchar/interop_wchar_i.cpp:
        * interop-tests/wchar/server.cpp:
          Layout changes and no need to convert to wchar

        * tao/Adapter_Registry.h:
        * tao/Condition.h:
        * tao/Connection_Handler.h:
        * tao/TAO_Singleton.h:
          Use ACE_Copy_Disabled

        * tao/Connector_Impl.cpp:
          Layout changes

3 files changed, 8 insertions, 34 deletions

diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index 1cadcf12b92..47f7140e41d 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -106,14 +106,11 @@ run_one_test (interop::WChar_Passer_ptr server,
   switch (test_num)
     {
     case WCHAR_TO_SERVER:
-      return server->wchar_to_server (ref.get_wchar(data_set),
-                                      data_set);
+      return server->wchar_to_server (ref.get_wchar(data_set), data_set);
     case WSTRING_TO_SERVER:
-      return server->wstring_to_server (ref.get_wstring(data_set),
-                                        data_set);
+      return server->wstring_to_server (ref.get_wstring(data_set), data_set);
     case WARRAY_TO_SERVER:
-      return server->warray_to_server (ref.get_warray(data_set),
-                                       data_set);
+      return server->warray_to_server (ref.get_warray(data_set), data_set);
     case ANY_WCHAR_TO_SERVER:
       {
         CORBA::Any a;
@@ -304,14 +301,13 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 #else
   try
   {
-    ACE_Argv_Type_Converter command_line(argc, argv);
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
     if (parse_args(argc, argv) == -1)
       return 0;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior));
+    CORBA::Object_var obj = orb->string_to_object(ior);
     if( CORBA::is_nil( obj.in() ) )
       ACE_ERROR_RETURN ((LM_ERROR,
                          "arg is not a valid ior sting"),
@@ -330,7 +326,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
     CORBA::String_var server_orb =
       server->orb_name();
     ACE_ERROR ((LM_ERROR,
-                "wchar_interop test (TAO client, %s server) %s\n",
+                "wchar_interop test (TAO client, %C server) %C\n",
                 server_orb.in(),
                 (result ? "passed" : "failed")));
     if (kill_server)
diff --git a/TAO/interop-tests/wchar/interop_wchar_i.cpp b/TAO/interop-tests/wchar/interop_wchar_i.cpp
index 75f819b6970..a06c3bbbc93 100644
--- a/TAO/interop-tests/wchar/interop_wchar_i.cpp
+++ b/TAO/interop-tests/wchar/interop_wchar_i.cpp
@@ -2,26 +2,6 @@
 //
 // $Id$
 
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:986
-
 #include "interop_wchar_i.h"
 
 // Implementation skeleton constructor
diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index e0830b030b1..084ad7a8083 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -80,10 +80,8 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
     {
         // Initialize orb
         CORBA::ORB_var orb = 
-          CORBA::ORB_init( command_line.get_argc(),
-                           command_line.get_ASCII_argv() );
-        if (parse_args(command_line.get_argc(),
-                       command_line.get_TCHAR_argv()))
+          CORBA::ORB_init(argc, argv);
+        if (parse_args(argc, argv))
           {
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("failed to parse args")),