From 7fa4ddf93e4fc51bd6af78a9666e721e3a159828 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 23 Jun 2018 17:27:40 +0200 Subject: [PATCH] :lipstick: fixed indentation --- .../nlohmann/detail/conversions/to_json.hpp | 18 +++++++++--------- single_include/nlohmann/json.hpp | 2 +- test/src/unit-conversions.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index 64090dcc..be32270b 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -52,15 +52,15 @@ struct external_constructor j.assert_invariant(); } - template::value, - int> = 0> - static void construct(BasicJsonType& j, const CompatibleStringType& str) - { - j.m_type = value_t::string; - j.m_value.string = j.template create(str); - j.assert_invariant(); - } + template::value, + int> = 0> + static void construct(BasicJsonType& j, const CompatibleStringType& str) + { + j.m_type = value_t::string; + j.m_value.string = j.template create(str); + j.assert_invariant(); + } }; template<> diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index fa60301c..82fada78 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -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) { diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp index 5b6dea22..548d0d9b 100644 --- a/test/src/unit-conversions.cpp +++ b/test/src/unit-conversions.cpp @@ -48,7 +48,7 @@ using nlohmann::json; #endif #if defined(JSON_HAS_CPP_17) -#include + #include #endif TEST_CASE("value conversion")