diff options
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/data/slime/json_format.cpp | 2 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/stllike/hash_map.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/data/slime/json_format.cpp b/vespalib/src/vespa/vespalib/data/slime/json_format.cpp index 9e4ba14e231..a5c7d31a046 100644 --- a/vespalib/src/vespa/vespalib/data/slime/json_format.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/json_format.cpp @@ -492,7 +492,7 @@ insertNumber(Inserter &inserter, bool isLong, const vespalib::string & value, ch inserter.insertLong(val); } else { double val = locale::c::strtod_au(value.c_str(), endp); - errorCode = errno; + errorCode = (errno == ERANGE ? 0 : errno); inserter.insertDouble(val); } assert(errorCode == 0 || errorCode == ERANGE || errorCode == EINVAL); diff --git a/vespalib/src/vespa/vespalib/stllike/hash_map.cpp b/vespalib/src/vespa/vespalib/stllike/hash_map.cpp index f1b659a0814..482deec3165 100644 --- a/vespalib/src/vespa/vespalib/stllike/hash_map.cpp +++ b/vespalib/src/vespa/vespalib/stllike/hash_map.cpp @@ -20,6 +20,7 @@ VESPALIB_HASH_MAP_INSTANTIATE(uint16_t, uint16_t); VESPALIB_HASH_MAP_INSTANTIATE(uint16_t, uint32_t); VESPALIB_HASH_MAP_INSTANTIATE(uint32_t, int32_t); VESPALIB_HASH_MAP_INSTANTIATE(uint32_t, uint32_t); +VESPALIB_HASH_MAP_INSTANTIATE(uint32_t, double); VESPALIB_HASH_MAP_INSTANTIATE(uint64_t, uint32_t); VESPALIB_HASH_MAP_INSTANTIATE(uint64_t, uint64_t); VESPALIB_HASH_MAP_INSTANTIATE(uint64_t, bool); |