ChangeLogTag: Thu Sep 11 15:41:47 2003 George Edwards <g.edwards@vanderbilt.edu>

4 files changed, 112 insertions, 92 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d1b69a468f7..9fa2bf738e1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep 11 15:41:47 2003  George Edwards <g.edwards@vanderbilt.edu>
+
+	* tests/OBV/Supports/Supports_Test_impl.cpp:
+	* tests/OBV/Supports/Supports_Test_impl.h:
+	* tests/Portable_Interceptors/Bug_1559/interceptors.cpp:
+
+	  Fixed compile errors due to missing ACE_ENV_ARG_DECL.
+
 Thu Sep 11 14:01:47 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/tmplinst.cpp:
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index cd28591efce..7440c932337 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -23,13 +23,15 @@ vt_graph_impl::vt_graph_impl (int num_nodes)
 }
 
 // Get the number of nodes in the vt_graph.
-CORBA::Long vt_graph_impl::size (void)
+CORBA::Long vt_graph_impl::size (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 	return nodes_ ().length ();
 }
 
 // Add a node to the graph with no edges.
-void vt_graph_impl::add_node (const char * name)
+void vt_graph_impl::add_node (const char * name ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 	Supports_Test::Node * new_node = 0;
   ACE_NEW (new_node, node_impl (name));
@@ -38,11 +40,12 @@ void vt_graph_impl::add_node (const char * name)
 }
 
 // Print out information about each node.
-void vt_graph_impl::print (void)
+void vt_graph_impl::print (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   cout << "Printing graph data..." << endl;
   cout << "Number of nodes: " << nodes_ ().length () << endl;
-  for (int i = 0; i < nodes_ ().length (); i++)
+  for (unsigned int i = 0; i < nodes_ ().length (); i++)
     nodes_ ()[i]->print ();
   cout << endl;
 }
@@ -50,7 +53,8 @@ void vt_graph_impl::print (void)
 
 /* vt_graph_init_impl - factory operations */
 
-Supports_Test::vt_graph * vt_graph_init_impl::create (void)
+Supports_Test::vt_graph * vt_graph_init_impl::create (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 	vt_graph_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, vt_graph_impl, 0);
@@ -182,7 +186,7 @@ void node_impl::add_edge (Supports_Test::Node * neighbor)
 // Remove the edge from this node to neighbor.
 void node_impl::remove_edge (Supports_Test::Node * neighbor)
 {
-  for (int i = 0; i < neighbors_ ().length (); i++)
+  for (unsigned int i = 0; i < neighbors_ ().length (); i++)
     if (neighbors_ ()[i] == neighbor)
       {
         neighbors_ ()[i] = neighbors_ ()[neighbors_ ().length () - 1];
@@ -202,20 +206,22 @@ void node_impl::print (void)
   cout << "    Weight: " << weight_ () << endl;
   cout << "    Degree: " << degree_ () << endl;
   cout << "    Neighbors: " << endl;
-  for (int i = 0; i < neighbors_ ().length (); i++)
+  for (unsigned int i = 0; i < neighbors_ ().length (); i++)
     cout << "      " << neighbors_ ()[i]->name_ () << endl;
 }
 
 /* node_init_impl - factory operations */
 
-Supports_Test::Node * node_init_impl::create (void)
+Supports_Test::Node * node_init_impl::create (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 	node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
   return ret_val;
 }
 
-CORBA::ValueBase * node_init_impl::create_for_unmarshal (void)
+CORBA::ValueBase * node_init_impl::create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 	node_impl * ret_val = 0;
   ACE_NEW_RETURN (ret_val, node_impl, 0);
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 9b2f563064a..9daf3c06410 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -6,7 +6,7 @@
 #include "Supports_TestS.h"
 #include "ace/Synch.h"
 #include "ace/Get_Opt.h"
-#include "ace/Streams.h"
+#include "ace/streams.h"
 
 /**
  * \class node_impl
@@ -17,32 +17,34 @@ class node_impl :
   public virtual OBV_Supports_Test::Node,
   public virtual CORBA::DefaultValueRefCountBase
 {
-
-public:
-
-	node_impl (void);
-	
-	node_impl (const char * name);
-
-	virtual void add_edge (Supports_Test::Node * neighbor);
-	
-	virtual void remove_edge (Supports_Test::Node * neighbor);
-
-	void change_weight (CORBA::Long new_weight);
-
+  
+ public:
+
+  node_impl (void);
+  
+  node_impl (const char * name);
+  
+  virtual void add_edge (Supports_Test::Node * neighbor);
+  
+  virtual void remove_edge (Supports_Test::Node * neighbor);
+  
+  void change_weight (CORBA::Long new_weight);
+  
   void print (void);
-
+  
 };
 
 class node_init_impl : public Supports_Test::Node_init
 {
-
-public:
-
-	virtual Supports_Test::Node * create (void);
-
-	virtual CORBA::ValueBase * create_for_unmarshal (void);
-
+  
+ public:
+  
+  virtual Supports_Test::Node * create (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::ValueBase * create_for_unmarshal (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 };
 
 
@@ -51,82 +53,86 @@ class vt_graph_impl :
   public virtual POA_Supports_Test::vt_graph,
   public virtual CORBA::DefaultValueRefCountBase
 {
-
-public:
-
-	vt_graph_impl (void);
-
-	vt_graph_impl (int num_nodes);
-
-	virtual CORBA::Long size (void);
-
-  virtual void add_node (const char * name);
-
-  virtual void print (void);
-
+  
+ public:
+  
+  vt_graph_impl (void);
+  
+  vt_graph_impl (int num_nodes);
+  
+  virtual CORBA::Long size (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void add_node (const char * name ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void print (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 };
 
 class vt_graph_init_impl :
   public Supports_Test::vt_graph_init
 {
-
-public:
-
-	virtual Supports_Test::vt_graph * create (void);
-
-	virtual CORBA::ValueBase * create_for_unmarshal (void);
-
+  
+ public:
+  
+  virtual Supports_Test::vt_graph * create (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+	
+  virtual CORBA::ValueBase * create_for_unmarshal (void);
+  
 };
 
 class test_impl :
   public virtual POA_Supports_Test::test,
   public virtual PortableServer::RefCountServantBase
 {
-
-public:
-
+  
+ public:
+  
   test_impl (CORBA::ORB_ptr orb);
-
+  
   virtual ~test_impl (void);
-
-	virtual void pass_obj_graph_in (Supports_Test::graph * graph_param
-                               ACE_ENV_ARG_DECL)
-                               ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param
-                              ACE_ENV_ARG_DECL)
-                              ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param
-                               ACE_ENV_ARG_DECL)
-                               ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param
-                              ACE_ENV_ARG_DECL)
-                              ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param
-                               ACE_ENV_ARG_DECL)
-                               ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param
-                              ACE_ENV_ARG_DECL)
-                              ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void start (ACE_ENV_SINGLE_ARG_DECL)
-                         ACE_THROW_SPEC ((CORBA::SystemException));
-
-	virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
-                         ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
+  
+  virtual void pass_obj_graph_in (Supports_Test::graph * graph_param
+				  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param
+				 ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param
+				   ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param
+				  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param
+				     ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param
+				    ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+ private:
+  
   CORBA::ORB_var orb_;
-
+  
   int num_clients_;
-
+  
   ACE_Thread_Mutex lock_;
-
+  
 };
 
 #endif /* TAO_SUPPORTS_TEST_IMPL_H */
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
index c802f9acf41..6cd378e8b7d 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
@@ -247,7 +247,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {