diff options
Diffstat (limited to 'TAO/examples/Persistent_Grid/Simple_util.cpp')
| -rw-r--r-- | TAO/examples/Persistent_Grid/Simple_util.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index 26c45b0dd80..647be2151c8 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -68,15 +68,15 @@ Server<Servant>::parse_args (void) template <class Servant> int Server<Servant>::init (const char *servant_name, int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, - "child_poa", - ACE_TRY_ENV) == -1) + "child_poa" + TAO_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -108,8 +108,8 @@ Server<Servant>::init (const char *servant_name, { CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, - &this->servant_, - ACE_TRY_ENV); + &this->servant_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -117,12 +117,12 @@ Server<Servant>::init (const char *servant_name, str.in ())); if (this->ior_output_file_) - { - ACE_OS::fprintf (this->ior_output_file_, - "%s", - str.in ()); - ACE_OS::fclose (this->ior_output_file_); - } + { + ACE_OS::fprintf (this->ior_output_file_, + "%s", + str.in ()); + ACE_OS::fclose (this->ior_output_file_); + } } ACE_CATCHANY @@ -138,10 +138,10 @@ Server<Servant>::init (const char *servant_name, } template <class Servant> int -Server<Servant>::run (CORBA::Environment &ACE_TRY_ENV) +Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - int ret = this->orb_manager_.run (ACE_TRY_ENV); + int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -245,15 +245,15 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -263,7 +263,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_, ACE_TRY_ENV); + this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -272,8 +272,8 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, "invalid ior <%s>\n", this->ior_), -1); - this->server_ = InterfaceObj::_narrow (server_object.in (), - ACE_TRY_ENV); + this->server_ = InterfaceObj::_narrow (server_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else |