Merge pull request #40 from jwillemsen/jwi-skel-constructor

Small layout and cleanup

3 files changed, 28 insertions, 30 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
index 1b530343a03..c8bc7e309a6 100755
--- a/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/server.cpp
@@ -64,34 +64,34 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
       PortableServer::POA_var test_poa = createPOA (root_poa.in(), poa_name );
 
-    Test_i *impl = new Test_i ();
-    PortableServer::Servant_var<Test_i> test_servant = impl;
-
-    PortableServer::ObjectId_var object_id =
-      PortableServer::string_to_ObjectId ("test_object");
-
-    test_poa->activate_object_with_id (object_id.in(), test_servant.in());
-
-    obj = test_poa->id_to_reference (object_id.in ());
-    CORBA::String_var test_ior = orb->object_to_string (obj.in ());
-    FILE *f = ACE_OS::fopen (ior_file_name, ACE_TEXT ("w"));
-    ACE_OS::fprintf (f, "%s", test_ior.in ());
-    ACE_OS::fclose (f);
-
-    mgr->activate();
-
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) Started Server <%s>\n"),
-                poa_name));
-
-    ACE_Time_Value tv (1,0);
-    orb->run (tv);
-    root_poa->destroy(1,1);
-    orb->destroy();
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("(%P|%t) Server <%s> orb destroyed\n"),
-                poa_name));
-  }
+      Test_i *impl = new Test_i ();
+      PortableServer::Servant_var<Test_i> test_servant = impl;
+
+      PortableServer::ObjectId_var object_id =
+        PortableServer::string_to_ObjectId ("test_object");
+
+      test_poa->activate_object_with_id (object_id.in(), test_servant.in());
+
+      obj = test_poa->id_to_reference (object_id.in ());
+      CORBA::String_var test_ior = orb->object_to_string (obj.in ());
+      FILE *f = ACE_OS::fopen (ior_file_name, ACE_TEXT ("w"));
+      ACE_OS::fprintf (f, "%s", test_ior.in ());
+      ACE_OS::fclose (f);
+
+      mgr->activate();
+
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t) Started Server <%s>\n"),
+                  poa_name));
+
+      ACE_Time_Value tv (1,0);
+      orb->run (tv);
+      root_poa->destroy(1,1);
+      orb->destroy();
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t) Server <%s> orb destroyed\n"),
+                  poa_name));
+    }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception (ACE_TEXT ("Server main()"));
     return 1;
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index f61b145bf7a..982ab13ebb7 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -12,7 +12,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 417e3d72eb3..3e73ac25c1c 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -837,7 +837,6 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 
   // Transfer ownership to the CORBA::Object
   (void) safe_objdata.release ();
-  return;
 }
 
 CORBA::Boolean