j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

💄 fixed indentation

Browse source
This commit is contained in:
Niels Lohmann 2018-06-23 17:27:40 +02:00
parent bf348ca8a4
commit 7fa4ddf93e
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/nlohmann/detail/conversions/to_json.hpp
View file

@ -52,15 +52,15 @@ struct external_constructor<value_t::string>
j.assert_invariant();
}
template<typename BasicJsonType, typename CompatibleStringType,
enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
int> = 0>
static void construct(BasicJsonType& j, const CompatibleStringType& str)
{
j.m_type = value_t::string;
j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
j.assert_invariant();
}
template<typename BasicJsonType, typename CompatibleStringType,
enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
int> = 0>
static void construct(BasicJsonType& j, const CompatibleStringType& str)
{
j.m_type = value_t::string;
j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
j.assert_invariant();
}
};
template<>

2
single_include/nlohmann/json.hpp
View file

@ -6091,8 +6091,8 @@ class binary_reader
const double val = [&half]
{
const int exp = (half >> 10) & 0x1F;
assert(0 <= exp and exp <= 32);
const int mant = half & 0x3FF;
assert(0 <= exp and exp <= 32);
assert(0 <= mant and mant <= 1024);
switch (exp)
{

2
test/src/unit-conversions.cpp
View file

@ -48,7 +48,7 @@ using nlohmann::json;
#endif
#if defined(JSON_HAS_CPP_17)
#include <string_view>
#include <string_view>
#endif
TEST_CASE("value conversion")