summaryrefslogtreecommitdiff
path: root/ACE/ace/Array_Map.inl
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-11-19 11:15:24 -0600
committerAdam Mitz <mitza@ociweb.com>2015-11-19 11:15:24 -0600
commit984fcc6833d78d6ab53be30d00618786c4c348de (patch)
tree0c8a1c16e5a87099014d82f55a970718c2295d53 /ACE/ace/Array_Map.inl
parentf2c23532a66ef1deeaeb70c8afc06e38dd083cb2 (diff)
downloadATCD-984fcc6833d78d6ab53be30d00618786c4c348de.tar.gz
Updated fix for SunCC's broken std::allocator.
Diffstat (limited to 'ACE/ace/Array_Map.inl')
-rw-r--r--ACE/ace/Array_Map.inl8
1 files changed, 1 insertions, 7 deletions
diff --git a/ACE/ace/Array_Map.inl b/ACE/ace/Array_Map.inl
index 0225dc8d5dc..32e7848c02d 100644
--- a/ACE/ace/Array_Map.inl
+++ b/ACE/ace/Array_Map.inl
@@ -1,19 +1,13 @@
// -*- C++ -*-
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-#if defined __SUNPRO_CC && !defined _RWSTD_ALLOCATOR
-# define ACE_SUNCC_CAST (pointer)
-#else
-# define ACE_SUNCC_CAST
-#endif
-
template<typename Key, typename Value, class EqualTo, class Alloc>
ACE_INLINE
ACE_Array_Map<Key, Value, EqualTo, Alloc>::ACE_Array_Map (
typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::size_type s)
: size_ (0)
, capacity_ (s)
- , nodes_ (s == 0 ? 0 : ACE_SUNCC_CAST this->alloc_.allocate (s))
+ , nodes_ (s == 0 ? 0 : this->alloc_.allocate (s))
{
std::uninitialized_fill_n (this->nodes_, s, value_type ());
}