diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-17 17:39:06 +0200 |
| commit | 77224bbf4842f3c7fb53ad7685f45cf768f5ec38 (patch) | |
| tree | 18da9d2a85b71038268b80333f3c27a116b6a3a3 /external/rapidjson/internal/strtod.h | |
| parent | Merge pull request #1083 (diff) | |
| parent | remove errant target_link_libraries (diff) | |
| download | monero-77224bbf4842f3c7fb53ad7685f45cf768f5ec38.tar.xz | |
Merge pull request #1084
5850122 remove errant target_link_libraries (Riccardo Spagni)
58abc09 don't build any miniupnpc executables (Riccardo Spagni)
114e368 don't build miniupnpc test executables (Riccardo Spagni)
bb69371 updated miniupnp (Riccardo Spagni)
f62ebc5 update rapidjson (Riccardo Spagni)
Diffstat (limited to 'external/rapidjson/internal/strtod.h')
| -rw-r--r-- | external/rapidjson/internal/strtod.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/rapidjson/internal/strtod.h b/external/rapidjson/internal/strtod.h index 89590c404..289c413b0 100644 --- a/external/rapidjson/internal/strtod.h +++ b/external/rapidjson/internal/strtod.h @@ -15,7 +15,6 @@ #ifndef RAPIDJSON_STRTOD_ #define RAPIDJSON_STRTOD_ -#include "../rapidjson.h" #include "ieee754.h" #include "biginteger.h" #include "diyfp.h" @@ -143,7 +142,7 @@ inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosit size_t remaining = length - i; const unsigned kUlpShift = 3; const unsigned kUlp = 1 << kUlpShift; - int error = (remaining == 0) ? 0 : kUlp / 2; + int64_t error = (remaining == 0) ? 0 : kUlp / 2; DiyFp v(significand, 0); v = v.Normalize(); |