.

4 files changed, 49 insertions, 37 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 0b9abae0632..b9f9d11a24f 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,15 @@
+Mon Jun  7 01:11:06 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Naming/Naming_Context.h: Added default
+ 	  CORBA::Environment & = TAO_default_environment() calls.  Thanks
+ 	  to Frank Buschmann for reporting this.
+
+	* orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h,
+ 	  orbsvcs/orbsvcs/Event/EC_Event_Channel.h: Added default
+ 	  CORBA::Environment & = TAO_default_environment() calls.  Thanks
+ 	  to J. Russell Noseworthy <rnosewor@objectsciences.com> for
+ 	  catching this.
+
 Sun Jun 06 23:17:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tao/POAC: Changed <InvalidPolicy::slot> back to
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 1e7f3eea363..2911211282d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -109,11 +109,11 @@ public:
   virtual ~TAO_EC_Event_Channel (void);
   // destructor
 
-  virtual void activate (CORBA::Environment& env);
+  virtual void activate (CORBA::Environment &env = TAO_default_environment ());
   // Start the internal threads (if any), etc.
   // After this call the EC can be used.
 
-  virtual void shutdown (CORBA::Environment &env);
+  virtual void shutdown (CORBA::Environment &env = TAO_default_environment ());
   // Shutdown any internal threads, cleanup all the internal
   // structures, flush all the messages, etc.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 50e4e9f7f95..c12b13aac4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -132,8 +132,8 @@ public:
 
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecUDPAdmin::AddrServer_ptr addr_server,
-             TAO_ECG_UDP_Out_Endpoint* endpoint,
-             CORBA::Environment &_env);
+             TAO_ECG_UDP_Out_Endpoint *endpoint,
+             CORBA::Environment &env = TAO_default_environment ());
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
   // scheduler.
@@ -149,20 +149,20 @@ public:
   // Setting the MTU can fail if the value is too small (at least the
   // header + 8 bytes must fit).
 
-  void shutdown (CORBA::Environment&);
+  void shutdown (CORBA::Environment & = TAO_default_environment ());
   // Disconnect and shutdown the sender, no further connections will
   // work unless init() is called again.
 
-  void open (RtecEventChannelAdmin::ConsumerQOS& sub,
-             CORBA::Environment& env);
+  void open (RtecEventChannelAdmin::ConsumerQOS &sub,
+             CORBA::Environment &env = TAO_default_environment ());
   // Connect (or reconnect) to the EC with the given subscriptions.
 
-  void close (CORBA::Environment& _env);
+  void close (CORBA::Environment &env = TAO_default_environment ());
   // Disconnect from the EC, but reconnection is still possible.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+  virtual void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ());
   virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &);
+                     CORBA::Environment & = TAO_default_environment ());
   // The PushConsumer methods.
 
 private:
@@ -178,7 +178,7 @@ private:
                       CORBA::ULong fragment_count,
                       iovec iov[],
                       int iovcnt,
-                      CORBA::Environment& _env);
+                      CORBA::Environment &env = TAO_default_environment ());
   // Send one fragment, the first entry in the iovec is used to send
   // the header, the rest of the iovec array should contain pointers
   // to the actual data.
@@ -336,7 +336,7 @@ public:
   // Return a buffer for the fragment at offset <fragment_offset>
 
   void decode (RtecEventComm::EventSet& event,
-               CORBA::Environment& _env);
+               CORBA::Environment &env = TAO_default_environment ());
   // Decode the events, the message must be complete.
 
   void inc_timeout (void);
@@ -427,7 +427,7 @@ public:
              ACE_Reactor *reactor,
              const ACE_Time_Value &expire_interval,
              int max_timeout,
-             CORBA::Environment &_env);
+             CORBA::Environment &env = TAO_default_environment ());
   // To do its job this class requires to know the local EC it will
   // connect to; it also requires to build an RT_Info for the local
   // scheduler.
@@ -437,14 +437,14 @@ public:
   // @@ TODO part of the RT_Info is hardcoded, we need to make it
   // parametric.
 
-  void shutdown (CORBA::Environment&);
+  void shutdown (CORBA::Environment & = TAO_default_environment ());
   // Disconnect and shutdown the gateway, no further connectsions
 
   void open (RtecEventChannelAdmin::SupplierQOS& pub,
-             CORBA::Environment &env);
+             CORBA::Environment &env = TAO_default_environment ());
   // Connect to the EC using the given publications lists.
 
-  virtual void close (CORBA::Environment& env);
+  virtual void close (CORBA::Environment &env = TAO_default_environment ());
   // Disconnect to the EC.
 
   int handle_input (ACE_SOCK_Dgram& dgram);
@@ -458,12 +458,12 @@ public:
   // messages...
 
   // The PushSupplier method.
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ());
 
 
   void get_addr (const RtecEventComm::EventHeader& header,
                  RtecUDPAdmin::UDP_Addr_out addr,
-                 CORBA::Environment& env);
+                 CORBA::Environment &env = TAO_default_environment ());
   // Call the RtecUDPAdmin::AddrServer
 
 private:
@@ -550,14 +550,14 @@ public:
   TAO_ECG_Mcast_EH (TAO_ECG_UDP_Receiver *recv);
 
   int open (RtecEventChannelAdmin::EventChannel_ptr ec,
-            CORBA::Environment& _env);
+            CORBA::Environment &env = TAO_default_environment ());
   // Register for changes in the EC subscription list.
   // When the subscription list becomes non-empty we join the proper
   // multicast groups (using the receiver to translate between event
   // types and mcast groups) and the class registers itself with the
   // reactor.
 
-  int close (CORBA::Environment& _env);
+  int close (CORBA::Environment &env = TAO_default_environment ());
   // Remove ourselves from the event channel, unsubscribe from the
   // multicast groups, close the sockets and unsubscribe from the
   // reactor.
@@ -567,9 +567,9 @@ public:
   // Reactor callbacks
 
   void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                        CORBA::Environment& _env);
+                        CORBA::Environment &env = TAO_default_environment ());
   void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                        CORBA::Environment& _env);
+                        CORBA::Environment &env = TAO_default_environment ());
   // The Observer methods
 
   class Observer : public POA_RtecEventChannelAdmin::Observer
@@ -589,12 +589,12 @@ public:
 
     // The Observer methods
     virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                                  CORBA::Environment& _env);
+                                  CORBA::Environment &env = TAO_default_environment ());
     virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                                  CORBA::Environment& _env);
+                                  CORBA::Environment &env = TAO_default_environment ());
 
   private:
-    TAO_ECG_Mcast_EH* eh_;
+    TAO_ECG_Mcast_EH *eh_;
     // Our callback object.
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
index 8cb611da717..3eeaf616d06 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
@@ -49,7 +49,7 @@ public:
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -60,7 +60,7 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
@@ -68,20 +68,20 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV);
+                               CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV);
+                                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
@@ -89,25 +89,25 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment
-                                                    &ACE_TRY_ENV);
+  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV =
+                                                    TAO_default_environment ());
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
   virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV);
+                                                         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Delete the naming context.  NOTE: the user should <unbind> any
   // bindings in which the given context is bound to some names before
   // invoking <destroy> operation on it.
@@ -116,13 +116,13 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
                      CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
   // not contain any additional bindings <bi> returned as null.
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env = TAO_default_environment ());
   // Returns the Default POA of this Servant object
 
 protected: