Wed Feb 22 09:24:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 11 insertions, 11 deletions

diff --git a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
index bbbf0263842..7d3089b7a7f 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleClient.cpp
@@ -23,7 +23,7 @@ int main(int argc, char * argv[])
 
 	// Get the "RootPOA"
   CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
-	PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
+  PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in ());
 
 	// activate its managers so it can handle incoming requests
 	poa->the_POAManager()->activate();
@@ -36,14 +36,14 @@ int main(int argc, char * argv[])
 	// orb with no name service or common file involved.
   obj = orb->string_to_object("corbaloc::localhost:9999/Simple");
 
-  if (CORBA::is_nil(obj)) {
+  if (CORBA::is_nil(obj.in ())) {
     ACE_ERROR ((LM_ERROR, "could not get reference\n"));
 		return 1;
 	}
 
 	// narrow the reference to the particular type we wish to deal with
-	Simple_var simple = Simple::_narrow(obj);
-  if (CORBA::is_nil(simple)) {
+  Simple_var simple = Simple::_narrow(obj.in ());
+  if (CORBA::is_nil(simple.in ())) {
     ACE_ERROR ((LM_ERROR, "could not get reference\n"));
 		return 1;
 	}
@@ -76,11 +76,11 @@ int main(int argc, char * argv[])
 	Callee_i * callee_i = new Callee_i;
 	// get the CORBA reference
 	Callee_var callee = callee_i->_this();
-  if (CORBA::is_nil(callee)) {
+  if (CORBA::is_nil(callee.in ())) {
     ACE_ERROR ((LM_ERROR, "could not get callback object\n"));
     return 1;
 	} else {
-    CORBA::String_var str = orb->object_to_string(callee);
+    CORBA::String_var str = orb->object_to_string(callee.in ());
     FILE *output_file= ACE_OS::fopen ("ior", "w");
     if (output_file == 0)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -104,7 +104,7 @@ int main(int argc, char * argv[])
   ACE_DEBUG ((LM_DEBUG, "Profile count is %d\n",
               iorm->get_profile_count(merged.in())));
 
-	simple->registerCallee(doubleCallee);
+  simple->registerCallee(doubleCallee.in ());
 
   ACE_OS::sleep(120);
 
diff --git a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
index 568a2ab2062..c9de7d114bb 100644
--- a/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
+++ b/TAO/tests/Bug_1383_Regression/SimpleServer.cpp
@@ -10,8 +10,8 @@ void advertise(CORBA::ORB_ptr orb, CORBA::Object_ptr obj)
 	// accessed by a client using the "cobaloc" syntax
   CORBA::String_var str = orb->object_to_string(obj);
   CORBA::Object_var tmp = orb->resolve_initial_references("IORTable");
-	IORTable::Table_var iorTable = IORTable::Table::_narrow(tmp);
-  if (CORBA::is_nil(iorTable)) {
+  IORTable::Table_var iorTable = IORTable::Table::_narrow(tmp.in ());
+  if (CORBA::is_nil(iorTable.in ())) {
     ACE_ERROR ((LM_ERROR, "could not get the IORTable, will not register\n"));
 	} else {
 		iorTable->rebind("Simple", str.in());
@@ -30,7 +30,7 @@ int main(int argc, char * argv[])
 
       // Get the "RootPOA"
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in ());
 
       // activate its managers so it can handle incoming requests
       poa->the_POAManager()->activate();
@@ -38,7 +38,7 @@ int main(int argc, char * argv[])
       // Create a CORBA object that can be called by a client. Note that
       // this does not create the CORBA object. It creates the object
       // that does the real work behind the CORBA object.
-      Simple_i * simple = new Simple_i(orb);
+      Simple_i * simple = new Simple_i(orb.in ());
 
       // This call creates the CORBA object and returns a reference to
       // it. It uses the "RootPOA" for dispatching its calls. There are