diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-22 21:32:07 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-24 16:51:44 -0400 |
| commit | 4347e3b15f10784b482544bd6324d3fcd4f0146c (patch) | |
| tree | 2db36c52a519275bf812f425caad9602617b4e2e /mdds | |
| parent | bb7d5ce2a8bd1dca51eb627aa2df811541053969 (diff) | |
Adjusted the patch against mdds 0.9.0.
Change-Id: Ia68f49996d4d50142c04d35ef2babb321afc4b3f
Diffstat (limited to 'mdds')
| -rw-r--r-- | mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 | ||||
| -rw-r--r-- | mdds/0001-Workaround-for-gcc-bug.patch | 27 | ||||
| -rw-r--r-- | mdds/UnpackedTarball_mdds.mk | 2 |
3 files changed, 28 insertions, 28 deletions
diff --git a/mdds/0001-Workaround-for-an-old-gcc-bug.patch b/mdds/0001-Workaround-for-an-old-gcc-bug.patch new file mode 100644 index 000000000000..8529fbfc2adf --- /dev/null +++ b/mdds/0001-Workaround-for-an-old-gcc-bug.patch @@ -0,0 +1,27 @@ +From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <kohei.yoshida@gmail.com> +Date: Sat, 22 Jun 2013 21:30:13 -0400 +Subject: [PATCH] Workaround for an old gcc bug. + +c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963 +--- + include/mdds/multi_type_vector_types.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp +index c4b2772..44af655 100644 +--- a/include/mdds/multi_type_vector_types.hpp ++++ b/c/d/include/mdds/multi_type_vector_types.hpp +@@ -278,7 +278,8 @@ public: + #ifndef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE + d.reserve(d.size() + len); + #endif +- std::copy(its.first, its.second, std::back_inserter(d)); ++ for (; its.first != its.second; ++its.first) ++ d.push_back(*its.first); + } + + static void assign_values_from_block( +-- +1.8.1.4 + diff --git a/mdds/0001-Workaround-for-gcc-bug.patch b/mdds/0001-Workaround-for-gcc-bug.patch deleted file mode 100644 index ef6572c54f95..000000000000 --- a/mdds/0001-Workaround-for-gcc-bug.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e1c795c8734119985ea09bf4d9f860d11e440b2a Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <kohei.yoshida@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/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk index c2a61ceb9daf..69fbf189cb46 100644 --- a/mdds/UnpackedTarball_mdds.mk +++ b/mdds/UnpackedTarball_mdds.mk @@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ mdds/mdds_0.6.0.patch \ - mdds/0001-Workaround-for-gcc-bug.patch \ + mdds/0001-Workaround-for-an-old-gcc-bug.patch \ )) # vim: set noet sw=4 ts=4: |