lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

Merge pull request #2033 from nlohmann/feature/issue1913

Browse Source 
Replace deprecated std::is_pod
This commit is contained in:
Niels Lohmann
2020-04-13 12:32:37 +02:00
committed by GitHub
parent 7fcc860329 9154e991b8
commit 3483d923d4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nlohmann/detail/output/binary_writer.hpp
View File

@ -1300,7 +1300,7 @@ class binary_writer
static CharType to_char_type(std::uint8_t x) noexcept static CharType to_char_type(std::uint8_t x) noexcept
{ {
static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
static_assert(std::is_pod<CharType>::value, "CharType must be POD"); static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
CharType result; CharType result;
std::memcpy(&result, &x, sizeof(x)); std::memcpy(&result, &x, sizeof(x));
return result; return result;

2
single_include/nlohmann/json.hpp
View File

@ -12908,7 +12908,7 @@ class binary_writer
static CharType to_char_type(std::uint8_t x) noexcept static CharType to_char_type(std::uint8_t x) noexcept
{ {
static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
static_assert(std::is_pod<CharType>::value, "CharType must be POD"); static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
CharType result; CharType result;
std::memcpy(&result, &x, sizeof(x)); std::memcpy(&result, &x, sizeof(x));
return result; return result;