summaryrefslogtreecommitdiff
path: root/TAO/examples/OBV
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/examples/OBV')
-rw-r--r--TAO/examples/OBV/Simple_util.cpp30
-rw-r--r--TAO/examples/OBV/Simple_util.h11
-rw-r--r--TAO/examples/OBV/Typed_Events/Client_i.cpp14
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp68
-rw-r--r--TAO/examples/OBV/Typed_Events/Event_Types_impl.h46
-rw-r--r--TAO/examples/OBV/Typed_Events/Server_i.cpp8
-rw-r--r--TAO/examples/OBV/Typed_Events/Server_i.h8
-rw-r--r--TAO/examples/OBV/Typed_Events/server.cpp8
8 files changed, 95 insertions, 98 deletions
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index a0e98b33d34..c44e47bf731 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -65,15 +65,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"),
@@ -102,8 +102,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,
@@ -131,10 +131,10 @@ Server<Servant>::init (const char *servant_name,
}
template <class Servant>int
-Server<Servant>::run (CORBA::Environment &env)
+Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
{
// Run the main event loop for the ORB.
- if (this->orb_manager_.run (env) == -1)
+ if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Server_i::run"),
-1);
@@ -237,15 +237,15 @@ Client<InterfaceObj, Var>::init (const char *name,
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_,
- name,
- ACE_TRY_ENV);
+ name
+ TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Parse command line and verify parameters.
@@ -257,7 +257,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;
@@ -266,8 +266,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
@@ -290,7 +290,7 @@ Client<InterfaceObj, Var>::init (const char *name,
template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &)
+Client<InterfaceObj, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return 0;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index d5f6e17fad1..d5edffeeb05 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -51,8 +51,8 @@ public:
int init (const char *servant_name,
int argc,
- char *argv[],
- CORBA::Environment &env);
+ char *argv[]
+ TAO_ENV_ARG_DECL);
// Initialize the Server state - parsing arguments and waiting.
// interface_name is the name used to register the Servant.
@@ -60,7 +60,7 @@ public:
// After calling <init>, this method will register the server with
// the TAO Naming Service using the servant_name passed to <init>.
- int run (CORBA::Environment &env);
+ int run (TAO_ENV_SINGLE_ARG_DECL);
// Run the orb.
protected:
@@ -121,7 +121,7 @@ public:
void shutdown (int);
// Fills in the shutdwon flag.
- int obtain_initial_references (CORBA::Environment &);
+ int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL);
// Initialize naming service
protected:
@@ -146,9 +146,6 @@ protected:
char *name_;
// Name to be usred for the naming service
- CORBA::Environment env_;
- // Environment variable.
-
CORBA::ORB_var orb_;
// Remember our orb.
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index fa7d17b334e..27fef1387c5 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name,
ACE_Time_Value now (ACE_OS::gettimeofday ());
ACE_OS::srand ((unsigned int) now.sec () );
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
ACE_TRY
{
@@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name,
new Temperature_impl (temperature)));
t_e->origin_id_ (KITCHEN);
t_e->do_print ();
- checkpoint->put_event (t_e, ACE_TRY_ENV);
+ checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
temperature = random_number (25,30);
t_e = new Temperature_impl (temperature);
t_e->origin_id_ (BATHROOM);
t_e->do_print ();
- checkpoint->put_event (t_e, ACE_TRY_ENV);
+ checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
Point point = { random_number (0,4),
@@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name,
new Position_impl (point)));
p_e->origin_id_ (JONAS);
p_e->do_print ();
- checkpoint->put_event (p_e, ACE_TRY_ENV);
+ checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name,
new Log_Msg_impl (urgent, a_text)));
l_e->origin_id_ (JONAS);
l_e->do_print ();
- checkpoint->put_event (l_e, ACE_TRY_ENV);
+ checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
- Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV));
+ Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER));
ACE_TRY_CHECK;
for (Event_List_Iterator i (list); i.next (); i.advance ())
@@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name,
}
if (checkpoint.shutdown () == 1)
- checkpoint->shutdown (ACE_TRY_ENV);
+ checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 9a33d49367e..605c614f27d 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -18,7 +18,7 @@ Event_impl::~Event_impl ()
}
void
-Event_impl::do_print (CORBA::Environment &)
+Event_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ",
(CORBA::ULong) this->time_(),
@@ -54,10 +54,10 @@ Temperature_impl::~Temperature_impl ()
}
void
-Temperature_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Temperature_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
{
// The timestamp
- Event_impl::do_print (ACE_TRY_ENV);
+ Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
@@ -91,51 +91,51 @@ Position_impl::~Position_impl ()
}
void
-Position_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Position_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
{
// The timestamp
- Event_impl::do_print (ACE_TRY_ENV);
+ Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::Float x =
- this->x(ACE_TRY_ENV);
+ this->x(TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::Float y =
- this->y(ACE_TRY_ENV);
+ this->y(TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::Float z =
- this->z(ACE_TRY_ENV);
+ this->z(TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
x, y, z));
}
-CORBA::Float Position_impl::x (CORBA::Environment &)
+CORBA::Float Position_impl::x (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return this->xyz()[0];
}
-void Position_impl::x (CORBA::Float x, CORBA::Environment &)
+void Position_impl::x (CORBA::Float x TAO_ENV_ARG_DECL_NOT_USED)
{
this->xyz()[0] = x;
}
-CORBA::Float Position_impl::y (CORBA::Environment &)
+CORBA::Float Position_impl::y (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return this->xyz()[1];
}
-void Position_impl::y (CORBA::Float y, CORBA::Environment &)
+void Position_impl::y (CORBA::Float y TAO_ENV_ARG_DECL_NOT_USED)
{
this->xyz()[1] = y;
}
-CORBA::Float Position_impl::z (CORBA::Environment &)
+CORBA::Float Position_impl::z (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return this->xyz()[2];
}
-void Position_impl::z (CORBA::Float z, CORBA::Environment &)
+void Position_impl::z (CORBA::Float z TAO_ENV_ARG_DECL_NOT_USED)
{
this->xyz()[2] = z;
}
@@ -169,10 +169,10 @@ Log_Msg_impl::~Log_Msg_impl ()
}
void
-Log_Msg_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Log_Msg_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
{
// The timestamp
- Event_impl::do_print (ACE_TRY_ENV);
+ Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
if (this->urgency () > 0)
@@ -221,20 +221,20 @@ Event_List_Link_impl::~Event_List_Link_impl ()
}
Event*
-Event_List_Link_impl::get_event (CORBA::Environment &)
+Event_List_Link_impl::get_event (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return this->my_event ();
}
Event_List_Link*
-Event_List_Link_impl::get_next_link (CORBA::Environment &)
+Event_List_Link_impl::get_next_link (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
return this->next ();
}
void
-Event_List_Link_impl::attach_next_link (Event_List_Link *n,
- CORBA::Environment &)
+Event_List_Link_impl::attach_next_link (Event_List_Link *n
+ TAO_ENV_ARG_DECL_NOT_USED)
{
this->next (n);
}
@@ -264,7 +264,7 @@ Event_List_impl::~Event_List_impl ()
}
void
-Event_List_impl::store_event (Event* e, CORBA::Environment &)
+Event_List_impl::store_event (Event* e TAO_ENV_ARG_DECL_NOT_USED)
{
// This operation should perform atomically and should
// guard against the access to the list from another thread.
@@ -405,8 +405,8 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
CORBA::Boolean
-Temperature_Criterion_impl::is_critical (Event* e,
- CORBA::Environment &)
+Temperature_Criterion_impl::is_critical (Event* e
+ TAO_ENV_ARG_DECL_NOT_USED)
{
// Downcast to a temperature.
Temperature* t = Temperature::_downcast (e);
@@ -423,7 +423,7 @@ Temperature_Criterion_impl::is_critical (Event* e,
void
-Temperature_Criterion_impl::do_print (CORBA::Environment &)
+Temperature_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
this->origin_id_ () ));
@@ -462,7 +462,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e, CORBA::Environment &)
+Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED)
{
Position* p = Position::_downcast (e);
// Is Event really a Position ?
@@ -483,13 +483,13 @@ Position_Criterion_impl::is_critical (Event* e, CORBA::Environment &)
void
-Position_Criterion_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Position_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG((LM_DEBUG,
"Alarm boundary for events with origin id %d is the box\n",
this->origin_id_ () ));
- this->leftbottom ()->do_print(ACE_TRY_ENV);
- this->topright ()->do_print(ACE_TRY_ENV);
+ this->leftbottom ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->topright ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
}
Position_Criterion_factory::~Position_Criterion_factory ()
@@ -515,8 +515,8 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
CORBA::Boolean
-Log_Msg_Criterion_impl::is_critical (Event* e,
- CORBA::Environment &)
+Log_Msg_Criterion_impl::is_critical (Event* e
+ TAO_ENV_ARG_DECL_NOT_USED)
{
Log_Msg* lm = Log_Msg::_downcast (e);
@@ -530,7 +530,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e,
void
-Log_Msg_Criterion_impl::do_print (CORBA::Environment &)
+Log_Msg_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
{
ACE_DEBUG((LM_DEBUG,
"All log messages with urgency greater zero are registered.\n" ));
@@ -564,8 +564,8 @@ Criterion_List_impl::~Criterion_List_impl ()
}
void
-Criterion_List_impl::store_criterion (Criterion *c,
- CORBA::Environment &)
+Criterion_List_impl::store_criterion (Criterion *c
+ TAO_ENV_ARG_DECL_NOT_USED)
{
if (!my_list ())
{
@@ -578,7 +578,7 @@ Criterion_List_impl::store_criterion (Criterion *c,
}
CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e, CORBA::Environment &)
+Criterion_List_impl::is_critical (Event *e TAO_ENV_ARG_DECL_NOT_USED)
{
// Try all criterions. Walking the list is efficient enough for
// demonstration.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index b6cad373a1d..ea8ce9b29f1 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -48,7 +48,7 @@ class Event_impl : public virtual OBV_Event,
Event_impl ();
virtual ~Event_impl ();
- virtual void do_print (CORBA::Environment &ACE_TRY_EN);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
// Implementation of the do_print () operation the valuetype should have.
// All operations in valuetypes are virtual.
@@ -119,7 +119,7 @@ public:
virtual ~Temperature_impl ();
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
// Overrides Event_impl::do_print (). Note that a new declaration
// in IDL in a derived class is not allowed.
};
@@ -145,15 +145,15 @@ public:
Position_impl (Point &p);
virtual ~Position_impl ();
- virtual CORBA::Float x (CORBA::Environment &ACE_TRY_ENV);
- virtual void x (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
- virtual CORBA::Float y (CORBA::Environment &ACE_TRY_ENV);
- virtual void y (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
- virtual CORBA::Float z (CORBA::Environment &ACE_TRY_ENV);
- virtual void z (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
+ virtual CORBA::Float x (TAO_ENV_SINGLE_ARG_DECL);
+ virtual void x (CORBA::Float TAO_ENV_ARG_DECL);
+ virtual CORBA::Float y (TAO_ENV_SINGLE_ARG_DECL);
+ virtual void y (CORBA::Float TAO_ENV_ARG_DECL);
+ virtual CORBA::Float z (TAO_ENV_SINGLE_ARG_DECL);
+ virtual void z (CORBA::Float TAO_ENV_ARG_DECL);
//These are the attributes
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
};
class Position_factory : public Position_init
@@ -178,7 +178,7 @@ public:
Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
virtual ~Log_Msg_impl ();
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
};
class Log_Msg_factory : public Log_Msg_init
@@ -210,12 +210,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
Event_List_Link_impl (Event *e);
virtual ~Event_List_Link_impl ();
- Event *get_event (CORBA::Environment &ACE_TRY_ENV);
+ Event *get_event (TAO_ENV_SINGLE_ARG_DECL);
private:
- Event_List_Link *get_next_link (CORBA::Environment &ACE_TRY_ENV);
+ Event_List_Link *get_next_link (TAO_ENV_SINGLE_ARG_DECL);
- void attach_next_link (Event_List_Link * chain, CORBA::Environment &ACE_TRY_ENV);
+ void attach_next_link (Event_List_Link * chain TAO_ENV_ARG_DECL);
// Attach a chain at the end.
};
@@ -239,9 +239,9 @@ class Event_List_impl : public virtual OBV_Event_List,
Event_List_impl ();
virtual ~Event_List_impl ();
- void store_event (Event* e, CORBA::Environment &ACE_TRY_ENV);
+ void store_event (Event* e TAO_ENV_ARG_DECL);
- Event_List_Link *get_first_link(CORBA::Environment &ACE_TRY_ENV);
+ Event_List_Link *get_first_link(TAO_ENV_SINGLE_ARG_DECL);
// The iterator needs it.
private:
@@ -317,8 +317,8 @@ public:
virtual ~Temperature_Criterion_impl ();
- CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
};
class Temperature_Criterion_factory : public Temperature_Criterion_init
@@ -343,8 +343,8 @@ public:
Position *tr);
virtual ~Position_Criterion_impl ();
- CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
};
class Position_Criterion_factory : public Position_Criterion_init
@@ -365,8 +365,8 @@ public:
Log_Msg_Criterion_impl ();
virtual ~Log_Msg_Criterion_impl ();
- CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
- virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+ virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
};
class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init
@@ -385,8 +385,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
Criterion_List_impl ();
virtual ~Criterion_List_impl ();
- void store_criterion (Criterion *c, CORBA::Environment &ACE_TRY_ENV);
- CORBA::Boolean is_critical (Event *e, CORBA::Environment &ACE_TRY_ENV);
+ void store_criterion (Criterion *c TAO_ENV_ARG_DECL);
+ CORBA::Boolean is_critical (Event *e TAO_ENV_ARG_DECL);
};
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 3715d0f4743..c21b0b8960c 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -109,8 +109,8 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
void
-Checkpoint_i::put_event (Event *event,
- CORBA::Environment &)
+Checkpoint_i::put_event (Event *event
+ TAO_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// In general this function would be a dispatcher which looks at the
@@ -140,7 +140,7 @@ Checkpoint_i::put_event (Event *event,
Event_List *
-Checkpoint_i::get_critical_events (CORBA::Environment &)
+Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// The skeleton should not steal our list by decrementing
@@ -157,7 +157,7 @@ Checkpoint_i::get_critical_events (CORBA::Environment &)
// Shutdown the server application.
void
-Checkpoint_i::shutdown (CORBA::Environment &)
+Checkpoint_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 00e14a571b2..3f3c0c00a2e 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -36,17 +36,17 @@ public:
// Destructor.
virtual void put_event (
- Event * e,
- CORBA::Environment &ACE_TRY_ENV
+ Event * e
+ TAO_ENV_ARG_DECL
)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual Event_List * get_critical_events (
- CORBA::Environment &ACE_TRY_ENV
+ TAO_ENV_SINGLE_ARG_DECL
)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (CORBA::Environment &env)
+ virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
// Shutdown the server.
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 80ca0fc570c..e04247695cd 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG,
"\n\tCheckpoint Event_Types server\n\n"));
- ACE_DECLARE_NEW_CORBA_ENV;
+ TAO_ENV_DECLARE_NEW_ENV;
ACE_TRY
{
if (server.init ("Event_Types_Checkpoint",
argc,
- argv,
- ACE_TRY_ENV) == -1)
+ argv
+ TAO_ENV_ARG_PARAMETER) == -1)
return 1;
else
{
- server.run (ACE_TRY_ENV);
+ server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
View Lorry Controller Status