*** empty log message ***

5 files changed, 8 insertions, 11 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
index 717f8b9f23e..d6c8f69cb7d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
@@ -19,8 +19,6 @@
 #define TAO_LOOKUP_C
 
 #include "Lookup.h"
-#include "ace/Auto_Ptr.h"
-#include <iostream.h>
 
 #include "Query_Only_Offer_Iterator.h"
 #include "Register_Offer_Iterator.h"
@@ -695,8 +693,8 @@ federated_query (const CosTrading::LinkNameSeq& links,
 }
 
 template <class TRADER> void
-TAO_Lookup<TRADER>
-::forward_query (const CosTrading::TraderName& starting_trader,
+TAO_Lookup<TRADER>::
+forward_query (const CosTrading::TraderName& starting_trader,
 		 const char *type,
 		 const char *constr,
 		 const char *pref,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
index e451ef2ec4e..4346ab17362 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
@@ -302,6 +302,8 @@ private:
   
   Request_Ids request_ids_;
   // A list of recent request_id_stems 
+
+  //  TAO_Register_Offer_Iterator<TRADER> msvc_dummy_;
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp
index 7eccfd435f7..a8f1ee84628 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.cpp
@@ -20,10 +20,6 @@
 
 #include "Register_Offer_Iterator.h"
 
-#ifndef min
-#define        min(a, b)               ((a) > (b) ? (b) : (a))
-#endif
-
 template <class TRADER>
 TAO_Register_Offer_Iterator<TRADER>::
 TAO_Register_Offer_Iterator (TRADER &trader,
@@ -76,7 +72,7 @@ TAO_Register_Offer_Iterator<TRADER>::next_n (CORBA::ULong n,
     this->trader_.service_type_map ();
 
   CORBA::ULong max_possible_offers_in_sequence =
-    min(n, this->offer_ids_.size ());
+    (n <  this->offer_ids_.size ()) ? n : this->offer_ids_.size ();
   offers->length (max_possible_offers_in_sequence);  
   
   // While there are entries left and we haven't filled <offers>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h
index b8c69483a74..0f16a7287e9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Register_Offer_Iterator.h
@@ -72,8 +72,8 @@ private:
 };
 
 
-#if defined (TAO_TEMPLATES_REQUIRE_SOURCE)
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Register_Offer_Iterator.cpp"
-#endif /* TAO_TEMPLATES_REQUIRE_SOURCE */
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #endif /* TAO_REGISTER_OFFER_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index d13d53a16a9..72d74332aec 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -224,6 +224,7 @@ TAO_Trader_Factory::create_linked_trader (void)
 
 }
 
+
 #ifdef ACE_HAS_THREADS
 /*
 TAO_Trader_Factory::TAO_TRADER*