Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Fix Gradle build on macOS 11.0 Big Sur (#2656)

Browse Source
This commit is contained in:
Prateek Machiraju
2020-08-29 23:29:49 -04:00
committed by GitHub
parent 83376bc231
commit 416288061a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpiutil/src/main/native/cpp/json_serializer.h
View File

@@ -36,6 +36,7 @@ SOFTWARE.
#include <clocale> // lconv, localeconv
#include <cmath> // labs, isfinite, isnan, signbit, ldexp
#include <locale> // locale
#include <type_traits>
#include "wpi/raw_ostream.h"
@@ -99,6 +100,18 @@ class json::serializer
*/
void dump_escaped(StringRef s, const bool ensure_ascii);
template <typename NumberType,
detail::enable_if_t<std::is_same_v<NumberType, uint64_t>, int> = 0>
bool is_negative_integer(NumberType x) {
return false;
}
template <typename NumberType,
detail::enable_if_t<std::is_same_v<NumberType, int64_t>, int> = 0>
bool is_negative_integer(NumberType x) {
return x < 0;
}
/*!
@brief dump an integer
@@ -121,7 +134,7 @@ class json::serializer
return;
}
const bool is_negative = (x <= 0) and (x != 0); // see issue #755
const bool is_negative = is_negative_integer(x); // see issue #755
std::size_t i = 0;
while (x != 0)