Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu>

10 files changed, 52 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index c14bbb491ee..db0b8a3b2ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 29 23:55:37 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* apps/drwho/server.cpp:
+	* apps/drwho/BS_Client.cpp:	  
+	  Used casts to quiet VxWorks/LynxOS.
+	* bin/auto_run_tests.lst: 
+	  Commented out this test - its broken.
+
 Wed Nov 29 09:41:51 2000  Johnny Willemsen <jwillemsen@remedy.nl>
         * examples/Reactor/Multicast/*.bor
           Added Borland C++ Builder specific makefiles. Thanks to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index c14bbb491ee..db0b8a3b2ea 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Wed Nov 29 23:55:37 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* apps/drwho/server.cpp:
+	* apps/drwho/BS_Client.cpp:	  
+	  Used casts to quiet VxWorks/LynxOS.
+	* bin/auto_run_tests.lst: 
+	  Commented out this test - its broken.
+
 Wed Nov 29 09:41:51 2000  Johnny Willemsen <jwillemsen@remedy.nl>
         * examples/Reactor/Multicast/*.bor
           Added Borland C++ Builder specific makefiles. Thanks to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index c14bbb491ee..db0b8a3b2ea 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,11 @@
+Wed Nov 29 23:55:37 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* apps/drwho/server.cpp:
+	* apps/drwho/BS_Client.cpp:	  
+	  Used casts to quiet VxWorks/LynxOS.
+	* bin/auto_run_tests.lst: 
+	  Commented out this test - its broken.
+
 Wed Nov 29 09:41:51 2000  Johnny Willemsen <jwillemsen@remedy.nl>
         * examples/Reactor/Multicast/*.bor
           Added Borland C++ Builder specific makefiles. Thanks to
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index d85cbe84c16..d2c28696c10 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Wed Nov 29 23:55:37 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp:
+	  Fixed link errors due to multiple template instantiations.
+
+	* orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp:
+ 	  Changed <get_primary> to throw TAO_IOP::NotFound () instead of
+	  Invalid_IOR ()
+	
 Wed Nov 29 17:59:10 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* examples/Load_Balancing_persistent/Load_Balancer_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 949d6cf36be..4fcda4d248e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -134,8 +134,8 @@ TAO_FT_IOGR_Property::get_primary (
   // Clean up in case of errors.
   if (CORBA::is_nil (new_obj.in ()))
     {
-          ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
-                            CORBA::Object::_nil ());
+      ACE_THROW_RETURN (TAO_IOP::NotFound (),  // ** Changed from Invalid_IOR () **
+                        CORBA::Object::_nil ());
     }
 
   // Release ownership of the pointers protected by the auto_ptrs since they
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 81aa4479554..c78f36407bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -410,7 +410,6 @@ template class TAO_Notify_ID_Pool<CosNotifyChannelAdmin::AdminID>;
 
 template class ACE_Unbounded_Set<CosNotifyChannelAdmin::AdminID>;
 template class ACE_Unbounded_Set_Iterator<CosNotifyChannelAdmin::AdminID>;
-template class ACE_Node<CosNotifyChannelAdmin::AdminID>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -419,6 +418,5 @@ template class ACE_Node<CosNotifyChannelAdmin::AdminID>;
 
 #pragma instantiate ACE_Unbounded_Set<CosNotifyChannelAdmin::AdminID>
 #pragma instantiate ACE_Unbounded_Set_Iterator<CosNotifyChannelAdmin::AdminID>
-#pragma instantiate ACE_Node<CosNotifyChannelAdmin::AdminID>
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index fbc3781a86a..bc7ebfc8ada 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -516,10 +516,6 @@ Worker::svc (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class  ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, int>
-
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/drwho/BS_Client.cpp b/apps/drwho/BS_Client.cpp
index 81af293a1b4..33b341aa3d5 100644
--- a/apps/drwho/BS_Client.cpp
+++ b/apps/drwho/BS_Client.cpp
@@ -19,21 +19,21 @@ BS_Client::BS_Client (void)
                Protocol_Record[this->count_]);
       ACE_NEW (this->sorted_record_,
                Protocol_Record *[this->count_]);
-  
+
       for (int i = 0; i < this->count_; i++)
         {
           Protocol_Record *prp = &this->protocol_record_[i];
 
           this->sorted_record_[i] = prp;
 
-          FILE_MANAGER::instance ()->get_login_and_real_name 
+          FILE_MANAGER::instance ()->get_login_and_real_name
             (prp->key_name1_, prp->key_name2_);
         }
-  
+
       ACE_OS::qsort (this->sorted_record_,
                      this->count_,
                      sizeof *this->sorted_record_,
-                     Binary_Search::name_compare);
+                     (ACE_COMPARE_FUNC)Binary_Search::name_compare);
     }
 }
 
@@ -46,30 +46,30 @@ Protocol_Record *
 BS_Client::insert (const char *key_name, int)
 {
 #if 0
-  Protocol_Record *pr = (Protocol_Record *) 
+  Protocol_Record *pr = (Protocol_Record *)
     ACE_OS::bsearch ((const void *) key_name,
                      (const void *) this->sorted_record_,
                      this->count_,
                      sizeof ...,
                      int (*compar)(const void *, const void *) ACE_OS::strcmp);
   return pr;
-#else                   
+#else
   int lo = 0;
   int hi = this->count_ - 1;
   Protocol_Record **sorted_buffer = this->sorted_record_;
-  
+
   while (lo <= hi)
     {
-      int mid 	= (lo + hi) / 2;
+      int mid   = (lo + hi) / 2;
       Protocol_Record *prp = sorted_buffer[mid];
       int cmp = ACE_OS::strcmp (key_name,
                                 prp->get_login ());
       if (cmp == 0)
-	return prp;
+        return prp;
       else if (cmp < 0)
-	hi = mid - 1;
+        hi = mid - 1;
       else
-	lo = mid + 1;
+        lo = mid + 1;
     }
 
   return 0;
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index aab798458e7..c0b5cb1f333 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -84,9 +84,9 @@ do_drwho (SMR_Server &smr_server)
 int
 main (int argc, char *argv[])
 {
-  ACE_OS::signal (SIGTERM, exit_server);
-  ACE_OS::signal (SIGINT, exit_server);
-  ACE_OS::signal (SIGQUIT, exit_server);
+  ACE_OS::signal (SIGTERM, (ACE_SignalHandler)exit_server);
+  ACE_OS::signal (SIGINT, (ACE_SignalHandler)exit_server);
+  ACE_OS::signal (SIGQUIT, (ACE_SignalHandler)exit_server);
 
   Options::set_options (argc, argv);
   Options::set_opt (Options::STAND_ALONE_SERVER);
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
     {
 
       for (;;)
-	do_drwho (smr_server);
+        do_drwho (smr_server);
 
       /* NOTREACHED */
     }
diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst
index 3f52a3f4426..f21625e25e3 100644
--- a/bin/auto_run_tests.lst
+++ b/bin/auto_run_tests.lst
@@ -51,7 +51,7 @@ TAO/examples/Buffered_Oneways/run_test.pl: MINIMUM
 # REQUIRES AMI 'TAO/examples/Buffered_AMI/run_test.pl: MINIMUM
 TAO/tests/InterOp-Naming/run_test.pl: MINIMUM
 TAO/tests/Multiple/run_test.pl
-TAO/tests/Exposed_Policies/run_test.pl
+# This test is broken - to be fixed by Angelo TAO/tests/Exposed_Policies/run_test.pl
 
 
 TAO/examples/POA/Adapter_Activator/run_test.pl: MINIMUM