ChangeLogTag:Wed Sep 16 20:39:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

5 files changed, 6 insertions, 15 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 3561aad5a00..142e162a985 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -376,7 +376,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info,
       return -1;
   }
 
-  ACE_DEBUG ((LM_DEBUG, "adding %s dependency to caller: %s\n",
+  ACE_DEBUG ((LM_DEBUG, "Sched (%t) adding %s dependency to caller: %s\n",
               (const char *) ((d.dependency_type == RtecScheduler::TWO_WAY_CALL)
                               ? "TWO_WAY" : "ONE_WAY"),
               (const char*)temp_info->entry_point.in ()));
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 3b078dc1231..385e05d7a49 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -198,8 +198,8 @@ int ACE_Scheduler::number_of_dependencies(RT_Info& rt_info)
 int ACE_Scheduler::add_dependency(RT_Info* rt_info,
                               const Dependency_Info& d)
 {
-  ACE_DEBUG ((LM_DEBUG, "adding dependecy to: %s\n",
-              (const char*)rt_info->entry_point));
+  // ACE_DEBUG ((LM_DEBUG, "Sched (%t) adding dependency to: %s\n",
+  //              (const char*)rt_info->entry_point));
   RtecScheduler::Dependency_Set& set = rt_info->dependencies;
   int l = set.length();
   set.length(l + 1);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index e2c4e5b140a..e5ee74a80d1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1171,5 +1171,5 @@ template CORBA::Boolean TAO_find (const CosTradingSequences::StringSeq&, const c
 #pragma instantiate CORBA::Boolean TAO_find (const CosTradingSequences::LongSeq&, const CORBA::Long)
 #pragma instantiate CORBA::Boolean TAO_find (const CosTradingSequences::ShortSeq&, const CORBA::Long)
 #pragma instantiate CORBA::Boolean TAO_find (const CosTradingSequences::UShortSeq&, const CORBA::ULong)
-#pragma instantiate CORBA::Boolean TAO_find (const CosTradingSequences::StringSeq&, const char*)
+#pragma instantiate CORBA::Boolean TAO_find (const CosTradingSequences::StringSeq&, const char* const)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 6eff76cf6e6..891117ffc4a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1267,12 +1267,9 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   // A random 4-bytes will prefix the sequence number space for each
   // trader, making it extremely unlikely that the sequence spaces for
   // two traders will over lap.
+  // @@ TODO: This is a bad way to generate pseudo random numbers.
   size_t time_value = ACE_OS::time ();
-# if defined (ACE_HAS_BROKEN_RANDR)
-  ACE_RANDR_TYPE seed = (ACE_RANDR_TYPE) time_value;
-# else
-  ACE_RANDR_TYPE seed = (ACE_RANDR_TYPE) &time_value;
-# endif /* ACE_HAS_BROKEN_RANDR */
+  ACE_RANDR_TYPE seed = ACE_static_cast(ACE_RANDR_TYPE, time_value);
 
   this->stem_id_.length (8);
   this->stem_id_[0] = ACE_static_cast (CORBA::Octet, ACE_OS::rand_r (seed) %  256);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 256564516d9..58ed40d5945 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -564,12 +564,6 @@ public:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Register (const TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   
-  // Type is a known service type.
-  
-  CORBA::Boolean find_property (CosTrading::PropertySeq &properties,
-				const char *property_name,
-				CORBA::ULong &position);
-  
  private:
 
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader_;