1 files changed, 10 insertions, 12 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 984c047c313..50835bec895 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -62,7 +62,7 @@ public:
   virtual ~TAO_EC_Gateway (void);
   // Destructor
 
-  virtual void close (CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void close (CORBA::Environment& env) = 0;
   // The gateway must disconnect from all the relevant event channels,
   // or any other communication media (such as multicast groups).
 
@@ -114,38 +114,36 @@ public:
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
              const char* rmt_name,
-             CORBA::Environment &env = TAO_default_environment ());
+             CORBA::Environment &_env);
   // To do its job this class requires to know the local and remote
   // ECs it will connect to; furthermore it also requires to build
   // RT_Infos for the local and remote schedulers.
   // @@ TODO part of the RT_Info is hardcoded, we need to make it
   // parametric.
 
-  void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_supplier (CORBA::Environment &);
   // The channel is disconnecting.
 
-  void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_consumer (CORBA::Environment &);
   // The channel is disconnecting.
 
   void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment & = TAO_default_environment ());
+             CORBA::Environment &);
   // This is the Consumer side behavior, it pushes the events to the
   // local event channel.
 
-  int shutdown (CORBA::Environment & = TAO_default_environment ());
+  int shutdown (CORBA::Environment&);
   // Disconnect and shutdown the gateway
 
   // The following methods are documented in the base class.
-  virtual void close (CORBA::Environment &env = TAO_default_environment ());
+  virtual void close (CORBA::Environment& _env);
   virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                                CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::Environment& env);
   virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                                CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::Environment& env);
 
 private:
-  void close_i (CORBA::Environment &);
+  void close_i (CORBA::Environment& );
 
   void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub,
                           CORBA::Environment& env);