ChangeLogTag: Sun May 20 10:43:02 2001 Balachandran Natarajan <bala@cs.wustl.edu>

15 files changed, 40 insertions, 29 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0a0e2e3aaad..ebdf862a978 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sun May 20 10:43:02 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tests/OctetSeq/test_i.{h,cpp}:
+	* tests/MT_Server/test_i.{h,cpp}:
+	* tests/Nested_Event_Loop/test_i.{h,cpp}:
+	* tests/Leader_Followers/test_i.{h,cpp}
+	* tests/Object_Loader/Test_i.{h,cpp}:
+	* tests/Single_Read/test_i.{h,cpp}: Fixed compile errors in Forte
+	  update 1.
+
 Sat May 19 20:37:00 2001  Balachandran Natarajan <bala@cs.wustl.edu>
 
 	* tests/Connection_Purging/server.dsp: Fixed an error on Win32
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 80855a3d3f2..c12bcb08073 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -11,7 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0,
                         ACE_TRY_ENV);
@@ -20,7 +20,7 @@ test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
 CORBA::ULong
 test_i::method (CORBA::ULong work,
                 CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server: Working for %d milli seconds @ %T\n",
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 7af64d56f89..776e7fc86fc 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -27,10 +27,10 @@ public:
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work,
                        CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index cfa5f5cba69..c0810d5df9e 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
@@ -22,7 +22,7 @@ Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
 
 void
 Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0, ACE_TRY_ENV);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index f7187dbb051..c49f47c8741 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -32,10 +32,10 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Long x, CORBA::Environment&)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index ceabdac5672..7e11926ffec 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -131,7 +131,7 @@ void
 client_i::loop (CORBA::ULong event_loop_depth,
                 CORBA::ULong event_loop_iterations,
                 CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::loop: event_loop_depth = %2.2d; event_loop_iterations = %2.2d\n",
@@ -164,7 +164,7 @@ void
 client_i::oneway_no_op (const act &act_for_iterations,
                         const act &act_for_flag,
                         CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -190,7 +190,7 @@ client_i::oneway_no_op (const act &act_for_iterations,
 
 void
 client_i::twoway_no_op (CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "client_i::twoway_no_op\n"));
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 370b1a5a78e..bcf3b1188db 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -39,15 +39,15 @@ public:
   void loop (CORBA::ULong event_loop_depth,
              CORBA::ULong event_loop_iterations,
              CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_no_op (const act &act_for_iterations,
                      const act &act_for_flag,
                      CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void twoway_no_op (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   server_var remote_partner_;
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 1269a3e1d5d..5f4ed5a86e1 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -19,14 +19,14 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 
 CORBA::Long
 Test_i::instance_count (CORBA::Environment &)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
 Test_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
     this->_default_POA (ACE_TRY_ENV);
@@ -40,7 +40,7 @@ Test_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 PortableServer::POA_ptr
 Test_i::_default_POA (CORBA::Environment &)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 1081689864d..06ecfd828b7 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -38,13 +38,13 @@ public:
   // ctor
 
   CORBA::Long instance_count (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void destroy (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_ptr _default_POA (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   PortableServer::POA_var poa_;
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index fabab6821c3..64dd349d241 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -74,7 +74,7 @@ Database_i::get_crc (Test::Index i,
 
 void
 Database_i::shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC (())
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index 6393e049db6..12205072e0a 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -48,7 +48,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
   void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/Etherealization/Makefile b/TAO/tests/POA/Etherealization/Makefile
index e875f17e8f7..8ea67db2260 100644
--- a/TAO/tests/POA/Etherealization/Makefile
+++ b/TAO/tests/POA/Etherealization/Makefile
@@ -45,8 +45,8 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: testC.h testC.i testC.cpp testS.h testS.i testS.cpp testS_T.h testS_T.i testS_T.cpp
 
-Etherealization:	$(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
+Etherealization: $(addprefix $(VDIR),$(SVR_OBJS))
+		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
 realclean: clean
 	-$(RM) testC.* testS.* testS_T.*
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 7c540d19e52..baafffe029d 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -96,7 +96,8 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
       Generator *gen = GENERATOR::instance (); // value generator
 
       // get some sequence length (not more than 10)
-      CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 5) + 5;
+      // CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 5) + 5;
+      CORBA::ULong len = 1;
 
       // set the length of the sequence
       this->in_.length (len);
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 86704d8ba2d..3b61bc553b7 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -13,7 +13,7 @@ void
 test_i::method (CORBA::ULong request_number,
                 const test::data &,
                 CORBA::Environment &)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("server: Iteration %d @ %T\n"),
@@ -28,7 +28,7 @@ test_i::method (CORBA::ULong request_number,
 
 void
 test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (())
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0,
                         ACE_TRY_ENV);
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index 45da7680d2f..0d5e0887b9e 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -31,10 +31,10 @@ public:
   void method (CORBA::ULong request_number,
                const test::data &,
                CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC (());
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// The ORB.