ChangeLogTag:Tue Mar 06 08:29:28 2001 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 59 insertions, 53 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 928433226f3..2737dbad535 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,38 +1,51 @@
+Tue Mar 06 08:29:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Collocation/Makefile.stub:
+        * tests/Collocation/Makefile.impl:
+          Define ACE_SHLIBS, this is the macro used to link shared
+          libraries.  Without the proper list of libraries the Tru64/CXX
+          compiler gives warnings, and other compilers could give out
+          errors.
+
+        * tests/AMI_Timeouts/timeout_i.cpp:
+        * tests/AMI_Timeouts/timeout_client.cpp:
+          Removed extra ';' at the end of function definitions.
+
 Tue Mar  6 07:15:06 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/MT_Client/simple-client.cpp: Fixed a typo that was giving
-	  annoying warnings in Debian boxes.
+        * tests/MT_Client/simple-client.cpp: Fixed a typo that was giving
+          annoying warnings in Debian boxes.
 
 Tue Mar  6 06:17:46 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests/Param_Test/client.cpp (run_sii_test): Make sure to
-	  call this->test_object_->print_values () before running each
- 	  test.  Thanks to Johnny Willemsen <jwillemsen@mego.nl> for
- 	  reporting this.
+        * tests/Param_Test/client.cpp (run_sii_test): Make sure to
+          call this->test_object_->print_values () before running each
+          test.  Thanks to Johnny Willemsen <jwillemsen@mego.nl> for
+          reporting this.
 
 Mon Mar  5 20:11:49 2001  Ossama Othman  <ossama@uci.edu>
 
-	* orbsvcs/examples/Security/Send_File/server.cpp (main): 
-	* orbsvcs/examples/Security/SecurityLevel1/server.cpp (main):
+        * orbsvcs/examples/Security/Send_File/server.cpp (main):
+        * orbsvcs/examples/Security/SecurityLevel1/server.cpp (main):
 
-	  More missing ACE_TRY_ENV parameter fixes.
+          More missing ACE_TRY_ENV parameter fixes.
 
 Mon Mar  5 19:32:56 2001  Ossama Othman  <ossama@uci.edu>
 
-	* TAO_IDL/be/be_visitor_array/any_op_cs.cpp (visit_array): 
-	* TAO_IDL/be/be_visitor_enum/any_op_cs.cpp (visit_enum): 
-	* TAO_IDL/be/be_visitor_exception/any_op_cs.cpp (visit_exception):
-	* TAO_IDL/be/be_visitor_interface/any_op_cs.cpp (visit_interface):
-	* TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp (visit_sequence):
-	* TAO_IDL/be/be_visitor_structure/any_op_cs.cpp (visit_structure):
-	* TAO_IDL/be/be_visitor_union/any_op_cs.cpp (visit_union):
-
-	  Fixed generated code that it does an ACE_TRY_CHECK before
-	  checking the return value of the CORBA::TypeCode::equivalent()
-	  call.  This fixes a subtle problem where the return code could
-	  be potentially meaningless due to the fact that an emulated
-	  exception was thrown.  This change also makes the code match the
-	  semantics of native exceptions more closely.
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp (visit_array):
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp (visit_enum):
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp (visit_exception):
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp (visit_interface):
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp (visit_sequence):
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp (visit_structure):
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp (visit_union):
+
+          Fixed generated code that it does an ACE_TRY_CHECK before
+          checking the return value of the CORBA::TypeCode::equivalent()
+          call.  This fixes a subtle problem where the return code could
+          be potentially meaningless due to the fact that an emulated
+          exception was thrown.  This change also makes the code match the
+          semantics of native exceptions more closely.
 
 Mon Mar  5 19:14:03 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index bbeda7053b8..b8b25d6ea3d 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -46,7 +46,7 @@ TimeoutClient::svc ()
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      
+
       // Tests timeouts for synchronous
       this->synch_test ();
 
@@ -59,7 +59,7 @@ TimeoutClient::svc ()
       // Tests AMI timeouts for influences on non-timeout calls
       this->none_test ();
 
-      // shut down remote ORB 
+      // shut down remote ORB
       timeoutObject_->shutdown (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -82,8 +82,7 @@ TimeoutClient::svc ()
               "TimeoutClient::svc: Done\n\n"));
 
   return 0;
-};
-
+}
 
 int
 TimeoutClient::initialize ()
@@ -130,7 +129,7 @@ TimeoutClient::send (bool async,
               "local: %dms remote: %dms  ... ",
               local_timeout,
               remote_sleep));
-     
+
   CORBA::PolicyList policy_list (1);
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -138,7 +137,7 @@ TimeoutClient::send (bool async,
     {
       if (local_timeout != 0)
         {
-          TimeBase::TimeT timeout = 10000 * local_timeout; 
+          TimeBase::TimeT timeout = 10000 * local_timeout;
 
           CORBA::Any any_orb;
           any_orb <<= timeout;
@@ -171,12 +170,12 @@ TimeoutClient::send (bool async,
       if (async)
         {
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
-                                                remote_sleep, 
+                                                remote_sleep,
                                                 ACE_TRY_ENV);
         }
       else // synch
         {
-          timeoutObject_->sendTimeToWait (remote_sleep, 
+          timeoutObject_->sendTimeToWait (remote_sleep,
                                           ACE_TRY_ENV);
         }
       ACE_TRY_CHECK_EX (normal);
@@ -211,7 +210,7 @@ TimeoutClient::send (bool async,
   ACE_CHECK;
 
   // wait for responses
-  ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000); 
+  ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000);
   ACE_OS::sleep (tv);
 
   ACE_Time_Value &elapsed_time = timeoutHandler_i_->elapsed_time ();
@@ -242,9 +241,9 @@ TimeoutClient::synch_test ()
   this->send (INVOKE_SYNCH,
               timeToWait_,    // local
               timeToWait_*2); // remote
-  // @@ Michael: In the collocated, but using the loopback interface, and 
+  // @@ Michael: In the collocated, but using the loopback interface, and
   //             if the reply to this request times out the replies to the
-  //             asynch invocations do not get dispatched 
+  //             asynch invocations do not get dispatched
   //             to the reply handler. Why?
   this->send (INVOKE_SYNCH,
               0,    // local
@@ -263,8 +262,7 @@ TimeoutClient::synch_test ()
               "TimeoutClient::synch_test - End\n\n"));
 
   return 0;
-};
-
+}
 
 int
 TimeoutClient::accuracy_test ()
@@ -297,8 +295,7 @@ TimeoutClient::accuracy_test ()
               "TimeoutClient::accuracy_test - End\n\n"));
 
   return 0;
-};
-
+}
 
 int
 TimeoutClient::none_test ()
@@ -335,4 +332,4 @@ TimeoutClient::none_test ()
               "TimeoutClient::none_test - End\n\n"));
 
   return 0;
-};
+}
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index a088bc08b5e..77b6c195cd7 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -22,19 +22,18 @@
 Timeout_i::Timeout_i (CORBA::ORB_ptr orb)
 {
   orb_ = CORBA::ORB::_duplicate (orb);
-};
+}
 
 Timeout_i::~Timeout_i ()
 {
-
-};
+}
 
 void
 Timeout_i::sendTimeToWait (CORBA::Long msec,
                            CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Timeout_i::sendTimeToWait: invoked with msec = %d\n\n",
               msec));
 
@@ -46,7 +45,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec,
       ACE_Time_Value tv (0, msec * 1000);
 	    ACE_OS::sleep (tv);
     }
-};
+}
 
 void
 Timeout_i::shutdown (CORBA::Environment &)
@@ -57,8 +56,6 @@ Timeout_i::shutdown (CORBA::Environment &)
               "Timeout_i::shutdown: shut down ORB\n\n"));
 }
 
-
-
 // Reply Handler implementation
 
 TimeoutHandler_i::TimeoutHandler_i ()
@@ -68,12 +65,11 @@ TimeoutHandler_i::TimeoutHandler_i ()
   timer_.reset ();
   timer_.start ();
   timer_.stop ();
-};
+}
 
 TimeoutHandler_i::~TimeoutHandler_i ()
 {
-
-};
+}
 
 void
 TimeoutHandler_i::sendTimeToWait (CORBA::Environment &)
@@ -83,7 +79,7 @@ TimeoutHandler_i::sendTimeToWait (CORBA::Environment &)
               "reply"));
   reply_counter_++;
   timer_.stop ();
-};
+}
 
 void
 TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutExceptionHolder *,
@@ -94,7 +90,7 @@ TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutExceptionHolder *,
               "excep"));
   reply_excep_counter_++;
   timer_.stop ();
-};
+}
 
 void
 TimeoutHandler_i::reset_reply_counter ()
diff --git a/TAO/tests/Collocation/Makefile.impl b/TAO/tests/Collocation/Makefile.impl
index 3e0d96f384c..7a3c2cb5630 100644
--- a/TAO/tests/Collocation/Makefile.impl
+++ b/TAO/tests/Collocation/Makefile.impl
@@ -22,7 +22,7 @@ TAO_IDLFLAGS += -Wb,skel_export_macro=Diamond_Export \
                 -Ge 1 -Gd
 
 LDLIBS = -lCollocation_Test_Stub -lTAO
-
+ACE_SHLIBS = -lCollocation_Test_Stub -lTAO -lACE
 SHLIB = libCollocation_Diamond.$(SOEXT)
 LIB = libCollocation_Diamond.a
 
diff --git a/TAO/tests/Collocation/Makefile.stub b/TAO/tests/Collocation/Makefile.stub
index d836e81e0c9..e64ad89eb55 100644
--- a/TAO/tests/Collocation/Makefile.stub
+++ b/TAO/tests/Collocation/Makefile.stub
@@ -22,7 +22,7 @@ TAO_IDLFLAGS += -Wb,skel_export_macro=Diamond_Export \
                 -Ge 1 -Gd
 
 LDLIBS = -lTAO
-
+ACE_SHLIBS = -lTAO -lACE
 SHLIB = libCollocation_Test_Stub.$(SOEXT)
 LIB = libCollocation_Test_Stub.a