diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-11-17 16:56:20 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-11-17 16:56:20 -0600 |
| commit | 7937dcbd45abadeff47a8bef65a5eeccf51e343c (patch) | |
| tree | 7a6ca17ad99fc75a840a2fea4a4fc293f11cdf68 /ACE/ace/Array_Map.inl | |
| parent | d25e42f5fe65078a497d58cd9b1889d65c7cb55b (diff) | |
| download | ATCD-7937dcbd45abadeff47a8bef65a5eeccf51e343c.tar.gz | |
Restored Solaris/SunCC compatibility.
Diffstat (limited to 'ACE/ace/Array_Map.inl')
| -rw-r--r-- | ACE/ace/Array_Map.inl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ACE/ace/Array_Map.inl b/ACE/ace/Array_Map.inl index 32e7848c02d..0225dc8d5dc 100644 --- a/ACE/ace/Array_Map.inl +++ b/ACE/ace/Array_Map.inl @@ -1,13 +1,19 @@ // -*- 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 : this->alloc_.allocate (s)) + , nodes_ (s == 0 ? 0 : ACE_SUNCC_CAST this->alloc_.allocate (s)) { std::uninitialized_fill_n (this->nodes_, s, value_type ()); } |