ChangeLogTag: Sun Sep 14 17:01:31 2003 George Edwards <g.edwards@vanderbilt.edu>

5 files changed, 15 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4b1e5fbb6ab..9539f175658 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Sun Sep 14 17:01:31 2003  George Edwards <g.edwards@vanderbilt.edu>
+
+        * tests/OBV/Supports/Supports_Test_impl.cpp:
+        * tests/OBV/Supports/Supports_Test_impl.h:
+        * tests/OBV/Supports/README:
+
+          Fixed compilation error due to incomplete mutex type declaration
+          in single-threaded builds. Updated documentation.
+
 Fri Sep 12 15:13:31 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/examples/Notify/Lanes/Supplier.dsp:
diff --git a/TAO/tests/OBV/Supports/README b/TAO/tests/OBV/Supports/README
index 6256d7c6be8..e708dff9ed8 100644
--- a/TAO/tests/OBV/Supports/README
+++ b/TAO/tests/OBV/Supports/README
@@ -10,7 +10,7 @@ probably not define an implementation of the interface. Doing so will result in
 multiple implementations of the same method - one for objects of the interface,
 and one for valuetypes - and clients will have no way to distiguish between the
 two, other than narrowing objects of the interface type to the
-valuetype. Instead, leave the interface unimplemented, and only define
+valuetype. Instead, one can leave the interface unimplemented, and only define
 implementations of its methods in the valuetype.
 
 The steps are as follows:
@@ -30,6 +30,3 @@ Supports_Test checks proper operation of the following features:
 -ORB::register_value_factory () return values:
    Supports_Test checks the return values of register_value_factory () to
    ensure compliance with the spec.
--Multithreading:
-   If the run_test.pl script is used, several clients will be spawned and the
-   server will used a thread-per-connection model.
\ No newline at end of file
diff --git a/TAO/tests/OBV/Supports/Supports_Test.idl b/TAO/tests/OBV/Supports/Supports_Test.idl
index 22631a893b7..4085c5db6a1 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.idl
+++ b/TAO/tests/OBV/Supports/Supports_Test.idl
@@ -4,7 +4,7 @@
 /**
  * \file Supports_Test.idl
  *
- * \author George Thomas Edwards <g.edwards@vanderbilt.edu>
+ * \author George Edwards <g.edwards@vanderbilt.edu>
  *
  * This file contain definitions of the valuetypes and interfaces of
  * Supports_Test, a test of TAO's OBV capabilities. Specifically, Supports_Test
@@ -83,6 +83,7 @@ module Supports_Test
    */
 	interface test
 	{
+
 		void pass_vt_graph_in (in vt_graph vt_graph_param);
 		void pass_obj_graph_in (in graph graph_param);
     void pass_vt_graph_out (out vt_graph vt_graph_param);
@@ -91,6 +92,7 @@ module Supports_Test
 		void pass_obj_graph_inout (inout graph graph_param);
     void start ();
     oneway void finish ();
+
 	};
 
 };
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
index 7440c932337..40c42c1c661 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp
@@ -71,7 +71,7 @@ CORBA::ValueBase * vt_graph_init_impl::create_for_unmarshal (void)
 
 /* test_impl */
 
-test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), num_clients_ (0)
+test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -145,16 +145,11 @@ void test_impl::pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param A
 
 void test_impl::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_Thread_Mutex, guard, lock_);
-  num_clients_++;
 }
 
 void test_impl::finish (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_Thread_Mutex, guard, lock_);
-  num_clients_--;
-	if (num_clients_ == 0)
-    this->_remove_ref ();
+  this->_remove_ref ();
 }
 
 
diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 9daf3c06410..40c22a96cca 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -129,10 +129,6 @@ class test_impl :
   
   CORBA::ORB_var orb_;
   
-  int num_clients_;
-  
-  ACE_Thread_Mutex lock_;
-  
 };
 
 #endif /* TAO_SUPPORTS_TEST_IMPL_H */