diff options
| author | msmit <msmit@remedy.nl> | 2010-09-30 05:41:49 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-09-30 05:41:49 +0000 |
| commit | 6cfcb7fc64b7b9c0ef1b8ea20bd6b8980d60e9e6 (patch) | |
| tree | fc750d28062f2d554ae5875b9c190f1620db28b0 /ACE/examples | |
| parent | 07d530a56a2770caaaf947b6d121a3bd71c1d0bd (diff) | |
| download | ATCD-6cfcb7fc64b7b9c0ef1b8ea20bd6b8980d60e9e6.tar.gz | |
Thu Sep 30 05:45:10 UTC 2010 Marcel Smit <msmit@remedy.nl>
* NEWS:
* ace/Cache_Map_Manager_T.h:
* ace/Cache_Map_Manager_T.inl:
* ace/Cache_Map_Manager_T.cpp:
* ace/Cached_Connect_Strategy_T.h:
* ace/Cached_Connect_Strategy_T.cpp:
* ace/Caching_Strategies_T.h:
* ace/Caching_Utility_T.cpp:
* ace/Cleanup_Strategies_T.cpp:
* ace/Hash_Cache_Map_Manager_T.h:
* ace/Hash_Cache_Map_Manager_T.cpp:
* ace/Map_T.h:
* ace/Map_T.inl:
* ace/Map_T.cpp:
* ace/Pair_T.h:
* ace/Pair_T.inl:
* examples/Web_Crawler/URL_Visitor.h:
* tests/Cache_Map_Manager_Test.cpp:
* tests/Cached_Accept_Conn_Test.h:
* tests/Cached_Conn_Test.cpp:
* tests/Map_Manager_Test.cpp:
Removed ACE_Pair from the ACE library.
Diffstat (limited to 'ACE/examples')
| -rw-r--r-- | ACE/examples/Web_Crawler/URL_Visitor.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h index 9f68612d629..f7522c6707c 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.h +++ b/ACE/examples/Web_Crawler/URL_Visitor.h @@ -31,7 +31,6 @@ #include "ace/Caching_Strategies_T.h" #include "ace/Cached_Connect_Strategy_T.h" #include "Options.h" -#include "ace/Pair_T.h" // Forward declarations. class URL_Validation_Visitor; @@ -239,7 +238,7 @@ protected: typedef int ATTRIBUTES; typedef ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> Client_Svc_Handler; -typedef ACE_Pair<Client_Svc_Handler *, ATTRIBUTES> +typedef std::pair<Client_Svc_Handler *, ATTRIBUTES> CACHED_HANDLER; typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> ACE_ADDR; @@ -306,51 +305,6 @@ public: URL_CACHE &url_cache (void); // Returns a reference to the URL cache. - - /* - - - typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> - Svc_Handler; - typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> - STRAT_CONNECTOR; - typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> - REFCOUNTED_HASH_RECYCLABLE_ADDRESS; - typedef ACE_NOOP_Creation_Strategy<Svc_Handler> - NULL_CREATION_STRATEGY; - typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler> - NULL_ACTIVATION_STRATEGY; - - typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\ - ACE_Pair<Svc_Handler *, int>,\ - ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\ - ACE_Null_Mutex> - CONNECTION_HASH_MAP; - typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\ - ACE_Pair<Svc_Handler *, int>,\ - ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\ - ACE_Null_Mutex> - CONNECTION_HASH_MAP_ITERATOR; - typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\ - ACE_Pair<Svc_Handler *, int>,\ - ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \ - ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\ - ACE_Null_Mutex> - CONNECTION_HASH_MAP_REVERSE_ITERATOR; - typedef ACE_Pair_Caching_Utility <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, \ - ACE_Pair<Svc_Handler *, int>, \ - CONNECTION_HASH_MAP, CONNECTION_HASH_MAP_ITERATOR, int > - CACHING_STRATEGY_UTILITY; - typedef ACE_LRU_Caching_Strategy<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\ - ACE_Pair<Svc_Handler *, int>,\ - CONNECTION_HASH_MAP, int,\ - CACHING_STRATEGY_UTILITY > - LRU; - typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler,ACE_SOCK_CONNECTOR, LRU,int, ACE_SYNCH_NULL_MUTEX> - CACHED_CONNECT_STRATEGY; - */ protected: virtual ~URL_Validation_Visitor (void); virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &); |