ChangeLogTag: Mon Apr 11 08:29:50 2005 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 51 insertions, 39 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 21a974ba41c..a7cfb58cd3e 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Mon Apr 11 08:29:50 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * DAnCE/ciao/Container_Impl.cpp:
+        * DAnCE/ciao/Dynamic_Component_Activator.cpp:
+        * DAnCE/ciao/Dynamic_Component_Activator.h:
+        * DAnCE/ciao/NodeApplication_Impl.cpp:
+        * DAnCE/ciao/NodeApplication_Impl.h:
+        * DAnCE/ciao/Swapping_Container.cpp:
+        * DAnCE/ciao/Swapping_Container.h:
+        
+          Fixed various glitches with environment variables, unused variables,
+          and ACE_TRY macros.
+
 Mon Apr 11 07:12:54 CDT 2005  Will Otte <wotte@dre.vanderbit.edu>
 	
 	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
index d94a8e59266..f339f63eea1 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
@@ -271,7 +271,7 @@ CIAO::Container_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
                    Components::RemoveFailure))
 {
   // Remove all components first.
-  this->remove_components (ACE_ENV_ARG_PARAMETER);
+  this->remove_components (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Even if above operation failed we should still remove homes.
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
index 41aaa02d477..61e9daad7b7 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
@@ -51,15 +51,13 @@ namespace CIAO
 
   void Dynamic_Component_Activator::add_servant_map
     (PortableServer::ObjectId &oid,
-     Dynamic_Component_Servant_Base* servant
-     ACE_ENV_ARG_DECL)
+     Dynamic_Component_Servant_Base* servant)
   {
     this->servant_map_.bind (oid, servant);
   }
 
   void Dynamic_Component_Activator::delete_servant_map
-    (PortableServer::ObjectId &oid
-     ACE_ENV_ARG_DECL)
+    (PortableServer::ObjectId &oid)
   {
     Dynamic_Component_Servant_Base* servant = 0;
     if (this->servant_map_.unbind (oid, servant) != 0)
@@ -70,5 +68,4 @@ namespace CIAO
 
     return;
   }
-
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
index 45965c74dd0..1e9a023f38c 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.h
@@ -79,11 +79,9 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     void add_servant_map (PortableServer::ObjectId &oid,
-                          Dynamic_Component_Servant_Base* servant
-                          ACE_ENV_ARG_DECL);
+                          Dynamic_Component_Servant_Base* servant);
 
-    void delete_servant_map (PortableServer::ObjectId &oid
-                             ACE_ENV_ARG_DECL);
+    void delete_servant_map (PortableServer::ObjectId &oid);
 
   private:
     /// Pointer to our ORB
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index fa514132dda..249c8026609 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -13,8 +13,8 @@ CIAO::NodeApplication_Impl::~NodeApplication_Impl (void)
 }
 
 CORBA::Long
-CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //@@TODO initialize this NodeApplication properties
   return 0;
@@ -22,22 +22,25 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
 
 CORBA::Long
 CIAO::NodeApplication_Impl::create_all_containers (
-  const ::Deployment::NodeImplementationInfo & node_impl_info
-  ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+    const ::Deployment::NodeImplementationInfo & node_impl_info
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create all the containers here based on the input node_impl_info.
   const CORBA::ULong len = node_impl_info.length ();
+  
   for (CORBA::ULong i = 0; i < len; ++i)
-  {
-    // The factory method <create_container> will intialize the container
-    // servant with properties, so we don't need to call <init> on the
-    // container object reference.
-    // Also, the factory method will add the container object reference
-    // to the set for us.
-    ::Deployment::Container_var cref =
-      this->create_container (node_impl_info[i].container_config);
-  }
+    {
+      // The factory method <create_container> will intialize the container
+      // servant with properties, so we don't need to call <init> on the
+      // container object reference.
+      // Also, the factory method will add the container object reference
+      // to the set for us.
+      ::Deployment::Container_var cref =
+        this->create_container (node_impl_info[i].container_config);
+    }
+  
   return 0;
 }
 
@@ -184,10 +187,10 @@ CIAO::NodeApplication_Impl::install (
                         CORBA::NO_MEMORY ());
       ACE_TRY_CHECK;
 
-      retv->length (0);
+      retv->length (0UL);
 
       // Call create_all_containers to create all the necessary containers..
-      this->create_all_containers (node_impl_info);
+      (void) this->create_all_containers (node_impl_info);
 
       // For each container, invoke <install> operation, this will return
       // the ComponentInfo for components installed in each container.
@@ -247,7 +250,7 @@ CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < set_size; ++i)
     {
       this->container_set_.at(i)->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      ACE_CHECK;
     }
 
   // Remove all containers
@@ -332,7 +335,9 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (this->container_set_.object_in_set (cref) == 0)
-    ACE_THROW (Components::RemoveFailure());
+    {
+      ACE_THROW (Components::RemoveFailure());
+    }
 
   cref->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -350,13 +355,16 @@ CIAO::NodeApplication_Impl::remove_container (::Deployment::Container_ptr cref
   // Should we remove the server still, even if the previous call failed.
 
   if (this->container_set_.remove (cref) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
+    {
+      ACE_THROW (::Components::RemoveFailure ());
+    }
+    
   ACE_DEBUG ((LM_DEBUG, "LEAVING: NodeApplication_Impl::remove_container()\n"));
 }
 
 // Get containers
 ::Deployment::Containers *
-CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeApplication_Impl::get_containers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
index a37dffead4e..c1580dbfbc6 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
@@ -166,7 +166,7 @@ namespace CIAO
     /// Create and initialize all the containers
     virtual CORBA::Long create_all_containers (
         const ::Deployment::NodeImplementationInfo & node_impl_info
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 1f4aac7f7cc..9f0db71c043 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -115,16 +115,14 @@ namespace CIAO
   void
   Swapping_Container::add_servant_map
     (PortableServer::ObjectId &oid,
-     Dynamic_Component_Servant_Base* servant
-     ACE_ENV_ARG_DECL)
+     Dynamic_Component_Servant_Base* servant)
   {
     this->dsa_->add_servant_map (oid, servant);
   }
 
   void
   Swapping_Container::delete_servant_map
-    (PortableServer::ObjectId &oid
-     ACE_ENV_ARG_DECL)
+    (PortableServer::ObjectId &oid)
   {
     this->dsa_->delete_servant_map (oid);
   }
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
index 9e1e08b7ccb..703427d1392 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
@@ -70,11 +70,9 @@ namespace CIAO
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     virtual void add_servant_map (PortableServer::ObjectId &oid,
-                                  Dynamic_Component_Servant_Base* servant
-                                  ACE_ENV_ARG_DECL);
+                                  Dynamic_Component_Servant_Base* servant);
 
-    virtual void delete_servant_map (PortableServer::ObjectId &oid
-                                  ACE_ENV_ARG_DECL);
+    virtual void delete_servant_map (PortableServer::ObjectId &oid);
 
     virtual void deactivate_facet (PortableServer::ObjectId &oid
                                   ACE_ENV_ARG_DECL)