hack so that the ACE_TYPENAME changes will compile on NT.

1 files changed, 20 insertions, 1 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 1d2aed44833..b22c52402ab 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -234,9 +234,18 @@ lookup_one_type (const char* type,
   // @@ Would have used Offer_Database::offer_iterator for less
   // coupling between TAO_Lookup and Offer_Database, but g++ barfs on
   // that.
+#if defined(_MSC_VER)
+  TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
+    offer_iter (type, offer_database);
+#else
+  // MSVC won't grok this for some reason, but it's necessary for the
+  // HP compiler, which seriously requires the typename keyword
+  // here. I apologize if this ifdef offends some ACE users'
+  // sensibilities --- it certainly offends mine. 
   ACE_TYPENAME TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
     offer_iter (type, offer_database);
-
+#endif
+  
   while (offer_filter.ok_to_consider_more () &&
          offer_iter.has_more_offers ())
     {
@@ -1096,8 +1105,18 @@ withdraw_using_constraint (const char *type,
   // Try to find the map of offers of desired service type.
   // @@ Again, should be Offer_Database::offer_iterator
   {
+#if defined(_MSC_VER)
+    TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
+      offer_iter (type, offer_database);
+#else
+    // MSVC won't grok this for some reason, but it's necessary for the
+    // HP compiler, which seriously requires the typename keyword
+    // here. I apologize if this ifdef offends some ACE users'
+    // sensibilities --- it certainly offends mine. 
     ACE_TYPENAME TAO_Offer_Database<MAP_LOCK_TYPE>::offer_iterator
       offer_iter (type, offer_database);
+#endif
+    
     TAO_Constraint_Validator validator (type_struct.in ());
     TAO_Constraint_Interpreter constr_inter (validator, constr, _env);
     TAO_CHECK_ENV_RETURN_VOID (_env);