TheCloud/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-08-09 13:06:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ecma404mode

Browse Source
This commit is contained in:
Alex Beregszaszi 2022-05-28 22:32:24 +02:00 committed by GitHub
commit 0ffbf71093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/json/allocator.h
View File

@ -9,7 +9,8 @@
#include <cstring> #include <cstring>
#include <memory> #include <memory>
#pragma pack(push, 8) #pragma pack(push)
#pragma pack()
namespace Json { namespace Json {
template <typename T> class SecureAllocator { template <typename T> class SecureAllocator {

3
include/json/json_features.h
View File

@ -10,7 +10,8 @@
#include "forwards.h" #include "forwards.h"
#endif // if !defined(JSON_IS_AMALGAMATION) #endif // if !defined(JSON_IS_AMALGAMATION)
#pragma pack(push, 8) #pragma pack(push)
#pragma pack()
namespace Json { namespace Json {

3
include/json/reader.h
View File

@ -23,7 +23,8 @@
#pragma warning(disable : 4251) #pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8) #pragma pack(push)
#pragma pack()
namespace Json { namespace Json {

3
include/json/value.h
View File

@ -53,7 +53,8 @@
#pragma warning(disable : 4251 4275) #pragma warning(disable : 4251 4275)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8) #pragma pack(push)
#pragma pack()
/** \brief JSON (JavaScript Object Notation). /** \brief JSON (JavaScript Object Notation).
*/ */

3
include/json/writer.h
View File

@ -20,7 +20,8 @@
#pragma warning(disable : 4251) #pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8) #pragma pack(push)
#pragma pack()
namespace Json { namespace Json {