[Libreoffice-commits] .: mdds/0001-Workaround-for-gcc-bug.patch mdds/makefile.mk

[Kohei Yoshida]

 mdds/0001-Workaround-for-gcc-bug.patch |   27 +++++++++++++++++++++++++++
 mdds/makefile.mk                       |    2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 2fe93734ba9136da402162c4c892e8af991164f9
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Jul 30 15:44:34 2012 -0400

    Get mdds to build against gcc 3.4.* thru 3.5.1.
    
    This is to work around:
    
    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963
    
    which is fixed in 3.5.2.
    
    Change-Id: Id0b409be7ba55f27005f3fd6fb4f77fa0090678d

diff --git a/mdds/0001-Workaround-for-gcc-bug.patch b/mdds/0001-Workaround-for-gcc-bug.patch
new file mode 100644
index 0000000..ef6572c
--- /dev/null
+++ b/mdds/0001-Workaround-for-gcc-bug.patch
@@ -0,0 +1,27 @@
+From e1c795c8734119985ea09bf4d9f860d11e440b2a Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Mon, 30 Jul 2012 14:36:24 -0400
+Subject: [PATCH] Workaround for gcc bug.
+
+c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963
+---
+ include/mdds/multi_type_vector_types.hpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp
+index 78f18cb..6189139 100644
+--- a/include/mdds/multi_type_vector_types.hpp
++++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_types.hpp
+@@ -218,7 +218,8 @@ public:
+         typename store_type::const_iterator it_end = it;
+         std::advance(it_end, len);
+         d.reserve(d.size() + len);
+-        std::copy(it, it_end, std::back_inserter(d));
++        for (; it != it_end; ++it)
++            d.push_back(*it);
+     }
+
+     static void assign_values_from_block(
+--
+1.7.7
+
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index 7fcd326..154bfa6 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -35,7 +35,7 @@ PATCH_FILES=\
             mdds_0.6.0-unused-parameter.patch \
             mdds_0.6.0-unreachable-code.patch \
 	    0001-fix-linking-error-with-boost-1.50.patch \
-
+            0001-Workaround-for-gcc-bug.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=