svn commit: r1602190 - in /openoffice/branches/AOO410/main/stlport/systemstl: hash_map hash_set slist

[jsc]

Author: jsc
Date: Thu Jun 12 14:53:13 2014
New Revision: 1602190

URL: http://svn.apache.org/r1602190
Log:
#124908# merge changes from trunk to be able to build on macos 10.9.3 and Xcode 
5.1

Modified:
    openoffice/branches/AOO410/main/stlport/systemstl/hash_map
    openoffice/branches/AOO410/main/stlport/systemstl/hash_set
    openoffice/branches/AOO410/main/stlport/systemstl/slist

Modified: openoffice/branches/AOO410/main/stlport/systemstl/hash_map
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/stlport/systemstl/hash_map?rev=1602190&r1=1602189&r2=1602190&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/stlport/systemstl/hash_map (original)
+++ openoffice/branches/AOO410/main/stlport/systemstl/hash_map Thu Jun 12 
14:53:13 2014
@@ -52,13 +52,12 @@ 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;
        typedef __T data_type;
 
        hash_map( void) {}
@@ -66,20 +65,19 @@ public:
 
 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;
        typedef __T data_type;
 
        hash_multimap( void) {}
@@ -87,7 +85,7 @@ public:
 
 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/branches/AOO410/main/stlport/systemstl/hash_set
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/stlport/systemstl/hash_set?rev=1602190&r1=1602189&r2=1602190&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/stlport/systemstl/hash_set (original)
+++ openoffice/branches/AOO410/main/stlport/systemstl/hash_set Thu Jun 12 
14:53:13 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/branches/AOO410/main/stlport/systemstl/slist
URL: 
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/stlport/systemstl/slist?rev=1602190&r1=1602189&r2=1602190&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/stlport/systemstl/slist (original)
+++ openoffice/branches/AOO410/main/stlport/systemstl/slist Thu Jun 12 14:53:13 
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;