openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1560325 - in /openoffice/trunk/main/stlport/systemstl: hash_map hash_set
Date Wed, 22 Jan 2014 12:06:51 GMT
Author: hdu
Date: Wed Jan 22 12:06:51 2014
New Revision: 1560325

URL: http://svn.apache.org/r1560325
Log:
#i123817# remove workaround obsoleted by the boost-1.55 update

boost>=1.49 fixes the quirks of unordered containers for compilers
that don't support rvalue references

Modified:
    openoffice/trunk/main/stlport/systemstl/hash_map
    openoffice/trunk/main/stlport/systemstl/hash_set

Modified: openoffice/trunk/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1560325&r1=1560324&r2=1560325&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_map (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_map Wed Jan 22 12:06:51 2014
@@ -64,13 +64,6 @@ public:
 	hash_map( void) {}
 	hash_map( size_t n) : _super( n) {}
 
-#ifdef BOOST_TR1_UNORDERED_MAP_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem

-	// in derived classes the copy assignment operator can only be declared implicitly if
-	// its base class's assignment operator has the canonical signature.
-	// boost's assignment operators don't have this canonical signature when move-semantics
are enabled
-	hash_map& operator=( const hash_map& r) { hash_map c(r); this->swap(c); return
*this; }
-#endif
-
 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
@@ -92,13 +85,6 @@ public:
 	hash_multimap( void) {}
 	hash_multimap( size_t n) : _super( n) {}
 
-#ifdef BOOST_TR1_UNORDERED_MAP_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem
-	// in derived classes the copy assignment operator can only be declared implicitly if
-	// its base class's assignment operator has the canonical signature.
-	// boost's assignment operators don't have this canonical signature when move-semantics
are enabled
-	hash_multimap& operator=( const hash_multimap& r) { hash_multimap c(r); this->swap(c);
return *this; }
-#endif
-
 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

Modified: openoffice/trunk/main/stlport/systemstl/hash_set
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_set?rev=1560325&r1=1560324&r2=1560325&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_set (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_set Wed Jan 22 12:06:51 2014
@@ -61,13 +61,6 @@ public:
 	hash_set( void) {}
 	hash_set( size_t n) : _super(n) {}
 
-#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem

-	// in derived classes the copy assignment operator can only be declared implicitly if
-	// its base class's assignment operator has the canonical signature.
-	// boost's assignment operators don't have this canonical signature when move-semantics
are enabled
-	hash_set& operator=( const hash_set& r) { hash_set c(r); this->swap(c); return
*this; }
-#endif
-
 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
@@ -86,13 +79,6 @@ public:
 	hash_multiset( void) {}
 	hash_multiset( size_t n) : _super( n) {}
 
-#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem

-	// in derived classes the copy assignment operator can only be declared implicitly if
-	// its base class's assignment operator has the canonical signature.
-	// boost's assignment operators don't have this canonical signature when move-semantics
are enabled
-	hash_multiset& operator=( const hash_multiset& r) { hash_multiset c(r); this->swap(c);
return *this; }
-#endif
-
 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



Mime
View raw message