Mon Apr 10 23:00:00 2000 Kirthika Parameswaran

<kirthika@cs.wustl.edu>

1 files changed, 14 insertions, 18 deletions

diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index c9b4cc3f330..f95a9f6daf9 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -35,11 +35,11 @@ TAO_IIOP_Connector::purge_connections (void)
 typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
         TAO_IIOP_LRU_CACHING_STRATEGY;
 
-# if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || \
-(TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 1)
+#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 1)
 typedef TAO_IIOP_LRU_CACHING_STRATEGY
         TAO_IIOP_CACHING_STRATEGY;
 #else
+#if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
 typedef ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
         TAO_IIOP_CACHING_STRATEGY;
 typedef ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
@@ -56,6 +56,7 @@ typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_II
         TAO_IIOP_FIFO_CACHING_STRATEGY_ADAPTER;
 typedef ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY, TAO_IIOP_NULL_CACHING_STRATEGY>
         TAO_IIOP_NULL_CACHING_STRATEGY_ADAPTER;
+#endif /* TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY = 0*/
 #endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES or TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY*/
 
 int
@@ -64,12 +65,12 @@ TAO_IIOP_Connector::make_caching_strategy (void)
   TAO_Resource_Factory *resource_factory =
     this->orb_core_->resource_factory ();
 
-#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || \
-(TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 1)
+#if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 1)
   ACE_NEW_RETURN (this->caching_strategy_,
                   TAO_IIOP_CACHING_STRATEGY,
                   -1);
 #else
+#if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
   switch (resource_factory->connection_caching_strategy_type ())
     {
     case TAO_Resource_Factory::NOOP:
@@ -97,11 +98,10 @@ TAO_IIOP_Connector::make_caching_strategy (void)
                       -1);
       break;
     }
-
+#endif /* TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0*/
 #endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES or
           TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 1*/
 
-
   this->caching_strategy_->purge_percent (resource_factory->purge_percentage ());
   return 0;
 }
@@ -184,10 +184,8 @@ template class ACE_Hash_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_KEY,
 
 template class ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
 
-// % levine 3 apr 2000 % Kirthika, please fix!
-// #if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || \
-// (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
+#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) 
+#if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
 template class ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
 template class ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
 template class ACE_FIFO_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>;
@@ -201,13 +199,12 @@ template class ACE_Caching_Strategy_Adapter<TAO_ATTRIBUTES, TAO_CACHING_UTILITY,
 template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
 template class ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
 template class ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
-
+#endif /*TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0*/
 #else
 
 template class ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>;
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-          TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0*/
+#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES*/
 
 template class ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>;
 template class ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>;
@@ -281,8 +278,8 @@ template class ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_C
 
 #pragma instantiate ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
 
-#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES) || \
-(TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
+#if !defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
+#if (TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0)
 
 #pragma instantiate ACE_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
 #pragma instantiate ACE_LFU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
@@ -297,13 +294,12 @@ template class ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_ADDR, TAO_C
 #pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_HASH_MAP_ITERATOR, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
 #pragma instantiate ACE_Cache_Map_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
 #pragma instantiate ACE_Cache_Map_Reverse_Iterator<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP_REVERSE_ITERATOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
-
+#endif /* TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0 */
 #else
 
 #pragma instantiate ACE_Cache_Map_Manager<TAO_ADDR, TAO_HANDLER *, TAO_HASH_MAP, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES>
 
-#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES
-          TAO_HAS_MINIMUM_CONNECTION_CACHING_STRATEGY == 0*/
+#endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES*/
 
 #pragma instantiate ACE_Cached_Connect_Strategy_Ex<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_CACHING_STRATEGY, TAO_ATTRIBUTES, TAO_Cached_Connector_Lock>
 #pragma instantiate ACE_Cached_Connect_Strategy<TAO_HANDLER, ACE_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>