freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on 8 and 9 where there is no std::strtoull.

Browse Source 
Do not bump revision since package content is unchanged.
This commit is contained in:
Vsevolod Stakhov
2014-08-27 12:09:49 +00:00
parent 94b387fbd8
commit e23d2e3e40
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
math/clasp/files/patch-libprogram_opts__src__string_convert.cpp Normal file
View File

@@ -0,0 +1,20 @@
--- ./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);
}
std::string& xconvert(std::string& out, long long x) {

30
math/gringo/files/patch-libprogram_opts__src__string_convert.cpp
View File

@@ -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) {