[Libreoffice-commits] .: boost/makefile.mk boost/unordered_map-doesnt-support-cp-ctor.patch

[David Tardon]

 boost/makefile.mk                                |    2 
 boost/unordered_map-doesnt-support-cp-ctor.patch |   92 +++++++++++++++++++++++
 2 files changed, 94 insertions(+)

New commits:
commit 9466edbd2ade8f9f40f82204deaf9c050f909a1c
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Feb 5 09:44:28 2011 +0100

    define copy ctor for boost::unordered_map/_set
    
    Build with gcc 4.6 breaks otherwise.

diff --git a/boost/makefile.mk b/boost/makefile.mk
index b9912d2..fb7c1c2 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -53,6 +53,8 @@ TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
 PATCH_FILES=$(TARFILE_NAME).patch
 #https://svn.boost.org/trac/boost/ticket/4713
 PATCH_FILES+=boost.4713.warnings.patch
+#https://svn.boost.org/trac/boost/ticket/5119
+PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
 
 ADDITIONAL_FILES= \
     libs/thread/src/win32/makefile.mk
diff --git a/boost/unordered_map-doesnt-support-cp-ctor.patch b/boost/unordered_map-doesnt-support-cp-ctor.patch
new file mode 100644
index 0000000..740c953
--- /dev/null
+++ b/boost/unordered_map-doesnt-support-cp-ctor.patch
@@ -0,0 +1,92 @@
+Index: /trunk/boost/unordered/unordered_set.hpp
+===================================================================
+--- misc/boost_1_44_0/boost/unordered/unordered_set.hpp	(revision 60754)
++++ misc/build/boost_1_44_0/boost/unordered/unordered_set.hpp	(revision 68445)
+@@ -155,4 +155,9 @@
+ 
+ #if !defined(BOOST_NO_RVALUE_REFERENCES)
++        unordered_set(unordered_set const& other)
++          : table_(other.table_)
++        {
++        }
++
+         unordered_set(unordered_set&& other)
+           : table_(other.table_, boost::unordered_detail::move_tag())
+@@ -163,4 +168,10 @@
+           : table_(other.table_, a, boost::unordered_detail::move_tag())
+         {
++        }
++
++        unordered_set& operator=(unordered_set const& x)
++        {
++            table_ = x.table_;
++            return *this;
+         }
+ 
+@@ -652,4 +663,9 @@
+ 
+ #if !defined(BOOST_NO_RVALUE_REFERENCES)
++        unordered_multiset(unordered_multiset const& other)
++          : table_(other.table_)
++        {
++        }
++
+         unordered_multiset(unordered_multiset&& other)
+           : table_(other.table_, boost::unordered_detail::move_tag())
+@@ -660,4 +676,10 @@
+           : table_(other.table_, a, boost::unordered_detail::move_tag())
+         {
++        }
++
++        unordered_multiset& operator=(unordered_multiset const& x)
++        {
++            table_ = x.table_;
++            return *this;
+         }
+ 
+Index: /trunk/boost/unordered/unordered_map.hpp
+===================================================================
+--- misc/boost_1_44_0/boost/unordered/unordered_map.hpp	(revision 60754)
++++ misc/build/boost_1_44_0/boost/unordered/unordered_map.hpp	(revision 68445)
+@@ -161,4 +161,9 @@
+ 
+ #if !defined(BOOST_NO_RVALUE_REFERENCES)
++        unordered_map(unordered_map const& other)
++          : table_(other.table_)
++        {
++        }
++
+         unordered_map(unordered_map&& other)
+           : table_(other.table_, boost::unordered_detail::move_tag())
+@@ -169,4 +174,10 @@
+           : table_(other.table_, a, boost::unordered_detail::move_tag())
+         {
++        }
++
++        unordered_map& operator=(unordered_map const& x)
++        {
++            table_ = x.table_;
++            return *this;
+         }
+ 
+@@ -706,4 +717,9 @@
+ 
+ #if !defined(BOOST_NO_RVALUE_REFERENCES)
++        unordered_multimap(unordered_multimap const& other)
++          : table_(other.table_)
++        {
++        }
++
+         unordered_multimap(unordered_multimap&& other)
+           : table_(other.table_, boost::unordered_detail::move_tag())
+@@ -714,4 +730,10 @@
+           : table_(other.table_, a, boost::unordered_detail::move_tag())
+         {
++        }
++
++        unordered_multimap& operator=(unordered_multimap const& x)
++        {
++            table_ = x.table_;
++            return *this;
+         }
+