ChangeLogTag: Sat Jan 12 09:46:00 2002 Venkita Subramonian <venkita@cs.wustl.edu>

6 files changed, 16 insertions, 10 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 5526310bf8f..5268dada502 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Sat Jan 12 09:46:00 2002  Venkita Subramonian  <venkita@cs.wustl.edu>
+
+	* tests/Two_Objects/server.cpp: 
+	* tests/Two_Objects/First_i.cpp:
+	* tests/Two_Objects/Second_i.cpp:
+	* tests/Two_Objects/Second_i.h:
+	* tests/Two_Objects/Object_Factory_i.cpp:
+	  Fixed compile errors on certain builds.
+
 Sat Jan 12 13:06:12 2002  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * tests/Makefile.bor:
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index a9e214aa02c..08e22cbe995 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -17,7 +17,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 }
 
 void
-First_i::oneway_method (TAO_ENV_SINGLE_ARG_DECL)
+First_i::oneway_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index c16df237595..a7d18778599 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -18,7 +18,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 
 //factory method to create first object
 Two_Objects_Test::First_ptr
-Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   First_i *first_impl;
@@ -36,7 +36,7 @@ Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 //factory method to create second object
 Two_Objects_Test::Second_ptr
-Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Second_i *second_impl;
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index a93cfb22c30..a2805cc5d21 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -21,7 +21,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
 }
 
 Two_Objects_Test::Octet_Seq *
-Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg;
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 2df93e4deeb..073f24e877f 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -17,10 +17,10 @@ public:
              CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
   Two_Objects_Test::Octet_Seq *
-    twoway_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    twoway_method (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 23a045d0a49..47bcb722c40 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -58,10 +58,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV
-
-  // @@ Comments in lcient.cpp apply here..
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       // Initialize the ORB
       CORBA::ORB_var orb =