diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Array_Map.h | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Array_Map.h')
| -rw-r--r-- | dep/acelite/ace/Array_Map.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/dep/acelite/ace/Array_Map.h b/dep/acelite/ace/Array_Map.h index 1515ea45529..0bd3b1ffeda 100644 --- a/dep/acelite/ace/Array_Map.h +++ b/dep/acelite/ace/Array_Map.h @@ -4,7 +4,7 @@ /** * @file Array_Map.h * - * $Id: Array_Map.h 84136 2009-01-12 11:01:17Z johnnyw $ + * $Id: Array_Map.h 92386 2010-10-28 07:44:37Z johnnyw $ * * Light weight array-based map with fast iteration but linear * (i.e. O(n)) search times. STL-style interface is exposed. @@ -110,12 +110,8 @@ public: */ ACE_Array_Map (size_type s = 0); -#ifndef ACE_LACKS_MEMBER_TEMPLATES template<typename InputIterator> ACE_Array_Map (InputIterator f, InputIterator l); -#else - ACE_Array_Map (const_iterator f, const_iterator l); -#endif /* !ACE_LACKS_MEMBER_TEMPLATES */ ACE_Array_Map (ACE_Array_Map const & map); ACE_Array_Map & operator= (ACE_Array_Map const & map); @@ -181,14 +177,9 @@ public: */ std::pair<iterator, bool> insert (value_type const & x); -#ifndef ACE_LACKS_MEMBER_TEMPLATES /// Insert range of elements into map. template<typename InputIterator> void insert (InputIterator f, InputIterator l); -#else - /// Insert range of elements into map. - void insert (const_iterator f, const_iterator l); -#endif /* ACE_LACKS_MEMBER_TEMPLATES */ /// Remove element at position @a pos from the map. void erase (iterator pos); |