External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix swapped signed and unsigned char types

Browse Source
This commit is contained in:
Colby Haskell 2023-11-05 10:20:14 -05:00
parent 9bf88d4f9d
commit df1dda712e
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/nlohmann/detail/input/input_adapters.hpp
View File

@ -25,6 +25,7 @@
#include <nlohmann/detail/iterators/iterator_traits.hpp> #include <nlohmann/detail/iterators/iterator_traits.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail
@ -141,14 +142,21 @@ struct char_traits : std::char_traits<T>
template<> template<>
struct char_traits<unsigned char> : std::char_traits<char> struct char_traits<unsigned char> : std::char_traits<char>
{ {
using char_type = signed char; using char_type = unsigned char;
using int_type = unsigned long;
// Redefine to_int_type function
static int_type to_int_type(char_type c)
{
return static_cast<int_type>(c);
}
}; };
// Explicitly define char traits for signed char since it is not standard // Explicitly define char traits for signed char since it is not standard
template<> template<>
struct char_traits<signed char> : std::char_traits<char> struct char_traits<signed char> : std::char_traits<char>
{ {
using char_type = unsigned char; using char_type = signed char;
}; };
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as

13
single_include/nlohmann/json.hpp
View File

@ -6107,6 +6107,8 @@ NLOHMANN_JSON_NAMESPACE_END
// #include <nlohmann/detail/macro_scope.hpp> // #include <nlohmann/detail/macro_scope.hpp>
// #include <nlohmann/detail/meta/type_traits.hpp>
NLOHMANN_JSON_NAMESPACE_BEGIN NLOHMANN_JSON_NAMESPACE_BEGIN
namespace detail namespace detail
@ -6223,14 +6225,21 @@ struct char_traits : std::char_traits<T>
template<> template<>
struct char_traits<unsigned char> : std::char_traits<char> struct char_traits<unsigned char> : std::char_traits<char>
{ {
using char_type = signed char; using char_type = unsigned char;
using int_type = unsigned long;
// Redefine to_int_type function
static int_type to_int_type(char_type c)
{
return static_cast<int_type>(c);
}
}; };
// Explicitly define char traits for signed char since it is not standard // Explicitly define char traits for signed char since it is not standard
template<> template<>
struct char_traits<signed char> : std::char_traits<char> struct char_traits<signed char> : std::char_traits<char>
{ {
using char_type = unsigned char; using char_type = signed char;
}; };
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as