summaryrefslogtreecommitdiff
path: root/TAO/tests/OBV/Factory
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/OBV/Factory')
-rw-r--r--TAO/tests/OBV/Factory/FactoryC_impl.cpp3
-rw-r--r--TAO/tests/OBV/Factory/FactoryC_impl.h2
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.cpp8
-rw-r--r--TAO/tests/OBV/Factory/FactoryS_impl.h8
-rw-r--r--TAO/tests/OBV/Factory/client.cpp24
-rw-r--r--TAO/tests/OBV/Factory/server.cpp20
6 files changed, 21 insertions, 44 deletions
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
index ee0512b4177..f2fc37618ad 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp
@@ -47,13 +47,12 @@ Value2_init_impl::create (
}
CORBA::ValueBase *
-Value2_init_impl::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+Value2_init_impl::create_for_unmarshal (void)
{
OBV_FactoryTest::Value2* ret_val = 0;
ACE_NEW_THROW_EX (ret_val,
Value2_impl,
CORBA::NO_MEMORY ());
- ACE_CHECK_RETURN (0);
return ret_val;
}
diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h
index 895d9fb808b..a42c6089ee9 100644
--- a/TAO/tests/OBV/Factory/FactoryC_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryC_impl.h
@@ -57,7 +57,7 @@ public:
public:
- virtual CORBA::ValueBase * create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual CORBA::ValueBase * create_for_unmarshal (void);
};
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index 49bd2e9401b..bfc2842ae64 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
}
OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_base_value (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::BaseValue* ret_val = 0;
@@ -24,7 +24,7 @@ Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value1 (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::Value1* ret_val = 0;
@@ -36,7 +36,7 @@ Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value2 (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
OBV_FactoryTest::Value2* ret_val = 0;
@@ -48,7 +48,7 @@ Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Test_impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+Test_impl::shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 8a1e97a6a5a..271bcdd2788 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,16 +31,16 @@ public:
Test_impl (CORBA::ORB_ptr orb);
// ctor
- virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::BaseValue * get_base_value (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::Value1 * get_value1 (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ virtual OBV_FactoryTest::Value2 * get_value2 (void)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (void)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..efe47235d4f 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -43,8 +43,7 @@ no_factory (OBV_FactoryTest::Test_ptr test)
// Calling this without a factory registred should give a marshal
// exception with minor code 1
OBV_FactoryTest::BaseValue_var base_value =
- test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test->get_base_value ();
}
ACE_CATCH (CORBA::MARSHAL, ex)
{
@@ -74,7 +73,6 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
@@ -82,11 +80,9 @@ main (int argc, char *argv[])
// Obtain reference to the object
CORBA::Object_var tmp =
orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
OBV_FactoryTest::Test_var test =
OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (test.in ()))
{
@@ -110,7 +106,6 @@ main (int argc, char *argv[])
orb->register_value_factory (base_factory->tao_repository_id (),
base_factory
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
base_factory->_remove_ref (); // release ownership
OBV_FactoryTest::Value1_init *value1_factory = 0;
@@ -121,7 +116,6 @@ main (int argc, char *argv[])
orb->register_value_factory (value1_factory->tao_repository_id (),
value1_factory
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
value1_factory->_remove_ref ();
OBV_FactoryTest::Value2_init *value2_factory = 0;
@@ -132,22 +126,18 @@ main (int argc, char *argv[])
orb->register_value_factory (value2_factory->tao_repository_id (),
value2_factory
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
value2_factory->_remove_ref ();
// Now perform the test. I don't check return values.
// I just hope to get MARSHAL.
OBV_FactoryTest::BaseValue_var base_value =
- test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test->get_base_value ();
OBV_FactoryTest::Value1_var value1 =
- test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test->get_value1 ();
OBV_FactoryTest::Value2_var value2 =
- test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test->get_value2 ();
// Test factories.
@@ -160,11 +150,9 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
- test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test->shutdown ();
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 5f6788e57d4..66fec931f07 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -41,15 +41,12 @@ main (int argc, char *argv[])
{
CORBA::ORB_var orb =
CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
PortableServer::POA_var root_poa =
PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (root_poa.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,8 +54,7 @@ main (int argc, char *argv[])
1);
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ root_poa->the_POAManager ();
if (parse_args (argc, argv) != 0)
return 1;
@@ -71,12 +67,10 @@ main (int argc, char *argv[])
PortableServer::ServantBase_var owner_transfer(test_impl);
OBV_FactoryTest::Test_var test =
- test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ test_impl->_this ();
CORBA::String_var ior =
orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
@@ -88,19 +82,15 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
ACE_OS::fclose (output_file);
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa_manager->activate ();
- orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ orb->destroy ();
}
ACE_CATCHANY
{
View Lorry Controller Status