aboutsummaryrefslogtreecommitdiff
path: root/math/gringo
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@FreeBSD.org>2014-08-27 12:09:49 +0000
committerVsevolod Stakhov <vsevolod@FreeBSD.org>2014-08-27 12:09:49 +0000
commite23d2e3e40c4a80f4a43eee3424a53266701f8a2 (patch)
tree967e6c394e1854024f9ae853be854dcfd70fdd14 /math/gringo
parent94b387fbd88299ad0f4faf620d9f72006413ef67 (diff)
downloadports-e23d2e3e40c4a80f4a43eee3424a53266701f8a2.tar.gz
ports-e23d2e3e40c4a80f4a43eee3424a53266701f8a2.zip
Fix build on 8 and 9 where there is no std::strtoull.
Do not bump revision since package content is unchanged.
Notes
Notes: svn path=/head/; revision=366312
Diffstat (limited to 'math/gringo')
-rw-r--r--math/gringo/files/patch-libprogram_opts__src__string_convert.cpp30
1 files changed, 19 insertions, 11 deletions
diff --git a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp b/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp
index a26046679fb4..d2a78301f8a3 100644
--- a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp
+++ b/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp
@@ -1,12 +1,20 @@
---- ./libprogram_opts/src/string_convert.cpp.orig 2014-08-12 17:47:21.000000000 +0200
-+++ ./libprogram_opts/src/string_convert.cpp 2014-08-21 22:39:08.000000000 +0200
-@@ -28,6 +28,9 @@
+--- ./libprogram_opts/src/string_convert.cpp.orig 2014-08-12 18:47:21.000000000 +0300
++++ ./libprogram_opts/src/string_convert.cpp 2014-08-27 14:59:59.000000000 +0300
+@@ -94,7 +94,7 @@
+ err = (char*)x+2;
+ }
+ else if (*x != '-') {
+- out = std::strtoul(x, &err, detectBase(x));
++ out = strtoul(x, &err, detectBase(x));
+ if (out == ULONG_MAX && errno == ERANGE) { err = (char*)x; }
+ }
+ else { err = (char*)x; }
+@@ -191,7 +191,7 @@
+ if (t) { out = temp; return t; }
+ if (empty(x, errPos) || *x == '-') { return 0; }
+ char* err;
+- out = std::strtoull(x, &err, detectBase(x));
++ out = strtoull(x, &err, detectBase(x));
+ return parsed(err != x, err, errPos);
}
- #endif
- #endif
-+namespace std {
-+ using ::strtoull;
-+}
- namespace bk_lib {
-
- static int detectBase(const char* x) {
+ std::string& xconvert(std::string& out, long long x) {