[odb-api] 11/14: Fix to patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Nov 5 16:23:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository odb-api.
commit 07e71bebbc20099301ea94e4cdd903de7580203f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Nov 5 09:56:39 2017 +0000
Fix to patch
---
debian/patches/unsigned-long-on-32bit.patch | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/patches/unsigned-long-on-32bit.patch b/debian/patches/unsigned-long-on-32bit.patch
index 123576c..4bd300c 100644
--- a/debian/patches/unsigned-long-on-32bit.patch
+++ b/debian/patches/unsigned-long-on-32bit.patch
@@ -1,3 +1,9 @@
+Description: Dont assume size_t is unsigned long : not true on some 32-bit systems
+ Fixes Fail to Build errors on Debian
+Author: Alastair McKimstry <mckinstry at debian.org>
+Last-Updated: 2017-11-05
+Forwarded: no
+
Index: odb-api-0.17.4/eckit/tests/config/test_configuration.cc
===================================================================
--- odb-api-0.17.4.orig/eckit/tests/config/test_configuration.cc
@@ -7,7 +13,7 @@ Index: odb-api-0.17.4/eckit/tests/config/test_configuration.cc
std::vector<int> value_arr_int = make_vector(1,2,3);
std::vector<long> value_arr_long = make_vector(4l,5l);
- std::vector<size_t> value_arr_size_t = make_vector(6ul,7ul);
-+ std::vector<size_t> value_arr_size_t = make_vector(6,7);
++ std::vector<size_t> value_arr_size_t = make_vector(size_t(6),size_t(7));
std::vector<float> value_arr_float = make_vector(1.234567f,2.345678f);
std::vector<double> value_arr_double = make_vector(1.234567,2.345678);
std::vector<std::string> value_arr_string = make_vector(std::string("hello"),std::string("world"));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git
More information about the debian-science-commits
mailing list