Author: hdu
Date: Thu May 15 12:16:43 2014
New Revision: 1594887
URL: http://svn.apache.org/r1594887
Log:
#i124908# remove custom allocator support in stlport-replacement headers
with the sal-internal custom allocator removed AOO no longer needs the
stlport-replacement headers to support the complexity of containers with
non-default allocators. Xcode>=5.1's libc++ runs into build problems with
such custom allocator support in the stlport-replacement headers because
of constness mismatches.
Modified:
openoffice/trunk/main/stlport/systemstl/hash_map
openoffice/trunk/main/stlport/systemstl/hash_set
openoffice/trunk/main/stlport/systemstl/slist
Modified: openoffice/trunk/main/stlport/systemstl/hash_map
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1594887&r1=1594886&r2=1594887&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_map (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_map Thu May 15 12:16:43 2014
@@ -55,40 +55,38 @@ template<
typename __K,
typename __T,
typename __H = hash<__K>,
- typename __E = equal_to<__K>,
- typename __A = allocator<pair<__K,__T> > >
+ typename __E = equal_to<__K> >
class hash_map
-: public unordered_map<__K,__T,__H,__E,__A>
+: public unordered_map<__K,__T,__H,__E>
{
public:
- typedef unordered_map<__K,__T,__H,__E,__A> _super;
+ typedef unordered_map<__K,__T,__H,__E> _super;
hash_map( void) {}
hash_map( size_t n) : _super( n) {}
private:
// setting the hasher dynamically is not supported in the emulation!
- hash_map( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
+ hash_map( size_t, const __H&, const __E& rE=__E()); // not implemented
};
template<
typename __K,
typename __T,
typename __H = hash<__K>,
- typename __E = equal_to<__K>,
- typename __A = allocator<pair<__K,__T> > >
+ typename __E = equal_to<__K> >
class hash_multimap
-: public unordered_multimap<__K,__T,__H,__E,__A>
+: public unordered_multimap<__K,__T,__H,__E>
{
public:
- typedef unordered_multimap<__K,__T,__H,__E,__A> _super;
+ typedef unordered_multimap<__K,__T,__H,__E> _super;
hash_multimap( void) {}
hash_multimap( size_t n) : _super( n) {}
private:
// setting the hasher dynamically is not supported in the emulation!
- hash_multimap( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
+ hash_multimap( size_t, const __H&, const __E& rE=__E()); // not
implemented
};
} // namespace std
Modified: openoffice/trunk/main/stlport/systemstl/hash_set
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_set?rev=1594887&r1=1594886&r2=1594887&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_set (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_set Thu May 15 12:16:43 2014
@@ -51,37 +51,35 @@ namespace std
template<
typename __K,
typename __H = hash<__K>,
- typename __E = equal_to<__K>,
- typename __A = allocator<__K> >
+ typename __E = equal_to<__K> >
class hash_set
-: public unordered_set<__K,__H,__E,__A>
+: public unordered_set<__K,__H,__E>
{
- typedef unordered_set<__K,__H,__E,__A> _super;
+ typedef unordered_set<__K,__H,__E> _super;
public:
hash_set( void) {}
hash_set( size_t n) : _super(n) {}
private:
// setting the hasher dynamically is not supported in the emulation!
- hash_set( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
+ hash_set( size_t, const __H&, const __E& rE=__E()); // not implemented
};
template<
typename __K,
typename __H = hash<__K>,
- typename __E = equal_to<__K>,
- typename __A = allocator<__K> >
+ typename __E = equal_to<__K> >
class hash_multiset
-: public unordered_multiset<__K,__H,__E,__A>
+: public unordered_multiset<__K,__H,__E>
{
- typedef unordered_multiset<__K,__H,__E,__A> _super;
+ typedef unordered_multiset<__K,__H,__E> _super;
public:
hash_multiset( void) {}
hash_multiset( size_t n) : _super( n) {}
private:
// setting the hasher dynamically is not supported in the emulation!
- hash_multiset( size_t, const __H&, const __E& rE=__E(), const __A&
rA=__A()); // not implemented
+ hash_multiset( size_t, const __H&, const __E& rE=__E()); // not
implemented
};
} // namespace std
Modified: openoffice/trunk/main/stlport/systemstl/slist
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/slist?rev=1594887&r1=1594886&r2=1594887&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/slist (original)
+++ openoffice/trunk/main/stlport/systemstl/slist Thu May 15 12:16:43 2014
@@ -57,11 +57,11 @@ namespace std
using STLP4_SLIST_EMUBASE;
// lame emulation of the pre-C++11 slist using the std::forward_list (or
std::list)
-template< typename T, class A=allocator<T> >
-class slist : public STLP4_SLIST_EMUBASE<T,A>
+template< typename T >
+class slist : public STLP4_SLIST_EMUBASE<T>
{
public:
- typedef typename STLP4_SLIST_EMUBASE<T,A> _super;
+ typedef typename STLP4_SLIST_EMUBASE<T> _super;
typedef typename _super::iterator slist_mit;
typedef typename _super::const_iterator slist_cit;
