diff options
Diffstat (limited to 'TAO/tests/OBV/Forward')
| -rw-r--r-- | TAO/tests/OBV/Forward/Test_impl.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/OBV/Forward/Test_impl.h | 4 | ||||
| -rw-r--r-- | TAO/tests/OBV/Forward/client.cpp | 66 | ||||
| -rw-r--r-- | TAO/tests/OBV/Forward/server.cpp | 42 |
4 files changed, 59 insertions, 59 deletions
diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index 207f1cbce9a..bfc72998512 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -31,7 +31,7 @@ reflect_node (BaseNode_ptr bn) TreeController * Test_impl::reflect (TreeController * tc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) @@ -43,8 +43,8 @@ Test_impl::reflect (TreeController * tc } void -Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index 50b172bdf4f..745f255ad87 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -33,10 +33,10 @@ public: virtual TreeController * reflect ( TreeController * tc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index cb4860dae7c..b71178be956 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) return 0; } -void +void dump_node (BaseNode_ptr bn, int indent) { if (bn == 0) return; @@ -51,29 +51,29 @@ dump_node (BaseNode_ptr bn, int indent) { ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n", bn, - sn->name ())); + sn->name ())); } else { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "%x <BaseNode> \n", - bn)); + bn)); } dump_node (bn->left (), indent + 1); dump_node (bn->right (), indent + 1); } -void +void dump_tree (TreeController_ptr tc) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%P|%t) start tree dump <%x>\n", tc)); dump_node (tc->root (), 1); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%P|%t) end tree dump <%x>\n", tc)); } @@ -85,7 +85,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -95,38 +95,38 @@ main (int argc, char *argv[]) // compiler so we just to put everything in a right order. // Create and register factory for BaseNode. - BaseNode_init *bn_factory = 0; - ACE_NEW_RETURN (bn_factory, + BaseNode_init *bn_factory = 0; + ACE_NEW_RETURN (bn_factory, BaseNode_init, 1); orb->register_value_factory (bn_factory->tao_repository_id (), - bn_factory - TAO_ENV_ARG_PARAMETER); + bn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. - TreeController_init *tc_factory = 0; - ACE_NEW_RETURN (tc_factory, + TreeController_init *tc_factory = 0; + ACE_NEW_RETURN (tc_factory, TreeController_init, 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - TAO_ENV_ARG_PARAMETER); + tc_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. - StringNode_init *sn_factory = 0; - ACE_NEW_RETURN (sn_factory, + StringNode_init *sn_factory = 0; + ACE_NEW_RETURN (sn_factory, StringNode_init, 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - TAO_ENV_ARG_PARAMETER); + sn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership @@ -134,10 +134,10 @@ main (int argc, char *argv[]) // Obtain reference to the object. CORBA::Object_var tmp = - orb->string_to_object(ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object(ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var test = Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER); + Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (test.in ())) @@ -149,16 +149,16 @@ main (int argc, char *argv[]) } // Now build simple graph (tree in our case). - + TreeController_var tc; - ACE_NEW_RETURN (tc, + ACE_NEW_RETURN (tc, OBV_TreeController, 1); // Create the root node. { StringNode_var sn; - ACE_NEW_RETURN (sn, + ACE_NEW_RETURN (sn, OBV_StringNode, 1); sn->name ((const char*)("RootNode")); @@ -167,17 +167,17 @@ main (int argc, char *argv[]) // Create the left leaf. { StringNode_var dummy; - ACE_NEW_RETURN (dummy, + ACE_NEW_RETURN (dummy, OBV_StringNode, 1); dummy->name ((const char*)("LeftNode")); - sn->left (dummy); + sn->left (dummy); } // Create the right leaf. { StringNode_var dummy; - ACE_NEW_RETURN (dummy, + ACE_NEW_RETURN (dummy, OBV_StringNode, 1); dummy->name ((const char*)("RightNode")); @@ -186,23 +186,23 @@ main (int argc, char *argv[]) // dummy->right (sn); // ;-) } } - + // Dump the tree. dump_tree (tc.in ()); - TreeController_var result_tc = - test->reflect (tc.in () TAO_ENV_ARG_PARAMETER); + TreeController_var result_tc = + test->reflect (tc.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Dump the resulting tree. dump_tree (result_tc.in ()); - test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index afd06f22f66..f1935936260 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -43,56 +43,56 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // All factories are kindly provided by // compiler so we just to put everything in a right order. // Create and register factory for BaseNode. - BaseNode_init *bn_factory = 0; - ACE_NEW_RETURN (bn_factory, + BaseNode_init *bn_factory = 0; + ACE_NEW_RETURN (bn_factory, BaseNode_init, 1); orb->register_value_factory (bn_factory->tao_repository_id (), bn_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; bn_factory->_remove_ref (); // release ownership // Create and register factory for TreeController. - TreeController_init *tc_factory = 0; - ACE_NEW_RETURN (tc_factory, + TreeController_init *tc_factory = 0; + ACE_NEW_RETURN (tc_factory, TreeController_init, 1); orb->register_value_factory (tc_factory->tao_repository_id (), - tc_factory - TAO_ENV_ARG_PARAMETER); + tc_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; tc_factory->_remove_ref (); // release ownership // Create and register factory for StringNode. - StringNode_init *sn_factory = 0; - ACE_NEW_RETURN (sn_factory, + StringNode_init *sn_factory = 0; + ACE_NEW_RETURN (sn_factory, StringNode_init, 1); orb->register_value_factory (sn_factory->tao_repository_id (), - sn_factory - TAO_ENV_ARG_PARAMETER); + sn_factory + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sn_factory->_remove_ref (); // release ownership //Well, done with factories. CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -101,7 +101,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -114,11 +114,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(test_impl); - Test_var test = test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -131,18 +131,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |