diff options
Diffstat (limited to 'ACE/ace/Array_Map.h')
| -rw-r--r-- | ACE/ace/Array_Map.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h index 4feefe97066..3e12910f74d 100644 --- a/ACE/ace/Array_Map.h +++ b/ACE/ace/Array_Map.h @@ -33,13 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if defined __SUNPRO_CC && !defined _RWSTD_ALLOCATOR -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator_interface< \ - std::allocator<void>, \ - std::pair<K, V> > -#else -# define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator<std::pair<K, V> > -#endif +#define ACE_ARRAY_MAP_DEFAULT_ALLOCATOR(K, V) std::allocator<std::pair<K, V> > /** * @class ACE_Array_Map @@ -92,7 +86,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * -# operator= */ template<typename Key, typename Value, class EqualTo = std::equal_to<Key>, - class Alloc = ACE_ARRAY_MAP_DEFAULT_ALLOCATOR (Key, Value) > + class Alloc = std::allocator<std::pair<Key,Value>>> class ACE_Array_Map { public: @@ -110,7 +104,8 @@ public: typedef value_type const * const_iterator; typedef ptrdiff_t difference_type; typedef size_t size_type; - ACE_DECLARE_STL_REVERSE_ITERATORS + typedef std::reverse_iterator<iterator> reverse_iterator; + typedef std::reverse_iterator<const_iterator> const_reverse_iterator; /// Default Constructor. /** @@ -287,13 +282,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # include "ace/Array_Map.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "ace/Array_Map.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Array_Map.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ +#include "ace/Array_Map.cpp" #include /**/ "ace/post.h" |