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

Remove anonymous namespace

Browse source
This commit is contained in:
Antonio Borondo 2018-10-03 13:51:49 +01:00
parent 7c385a4844
commit b6fdad9acd
2 changed files with 190 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -115,11 +115,9 @@ class input_buffer_adapter : public input_adapter_protocol
const char* const limit;
};
namespace
template<typename WideStringType, size_t T>
struct wide_string_input_helper
{
template<typename WideStringType, size_t T>
struct wide_string_input_helper
{
// UTF-32
static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
{
@ -170,11 +168,11 @@ namespace
}
}
}
};
};
template<typename WideStringType>
struct wide_string_input_helper<WideStringType, 2>
{
template<typename WideStringType>
struct wide_string_input_helper<WideStringType, 2>
{
// UTF-16
static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
{
@ -231,8 +229,7 @@ namespace
}
}
}
};
}
};
template<typename WideStringType>
class wide_string_input_adapter : public input_adapter_protocol

17
single_include/nlohmann/json.hpp
View file

@ -1993,11 +1993,9 @@ class input_buffer_adapter : public input_adapter_protocol
const char* const limit;
};
namespace
template<typename WideStringType, size_t T>
struct wide_string_input_helper
{
template<typename WideStringType, size_t T>
struct wide_string_input_helper
{
// UTF-32
static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
{
@ -2048,11 +2046,11 @@ namespace
}
}
}
};
};
template<typename WideStringType>
struct wide_string_input_helper<WideStringType, 2>
{
template<typename WideStringType>
struct wide_string_input_helper<WideStringType, 2>
{
// UTF-16
static void fill_buffer(const WideStringType& str, size_t& current_wchar, std::array<std::char_traits<char>::int_type, 4>& utf8_bytes, size_t& utf8_bytes_index, size_t& utf8_bytes_filled)
{
@ -2109,8 +2107,7 @@ namespace
}
}
}
};
}
};
template<typename WideStringType>
class wide_string_input_adapter : public input_adapter_protocol