Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
3rd
jsoncpp2
Commits
d6e666f5
Commit
d6e666f5
authored
8 years ago
by
Sergiy80
Browse files
Options
Download
Email Patches
Plain Diff
Add pragma pack directive
Related to
https://github.com/open-source-parsers/jsoncpp/issues/458
parent
a691cb19
master
00.11.z
BillyDonahue-avoid-isprint
archersim/1.9.5
hwcd/bugfix
jsoncpp_version
pypi
update
1.9.5
1.9.4
1.9.3
1.9.2
1.9.1
1.9.0
1.8.4
1.8.3
1.8.2
1.8.1
1.8.0
00.11.0
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
include/json/allocator.h
+4
-0
include/json/allocator.h
include/json/features.h
+4
-0
include/json/features.h
include/json/reader.h
+4
-0
include/json/reader.h
include/json/value.h
+3
-0
include/json/value.h
include/json/writer.h
+4
-0
include/json/writer.h
with
19 additions
and
0 deletions
+19
-0
include/json/allocator.h
View file @
d6e666f5
...
...
@@ -9,6 +9,8 @@
#include <cstring>
#include <memory>
#pragma pack(push, 8)
namespace
Json
{
template
<
typename
T
>
class
SecureAllocator
{
...
...
@@ -91,4 +93,6 @@ bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) {
}
//namespace Json
#pragma pack(pop)
#endif // CPPTL_JSON_ALLOCATOR_H_INCLUDED
This diff is collapsed.
Click to expand it.
include/json/features.h
View file @
d6e666f5
...
...
@@ -10,6 +10,8 @@
#include "forwards.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
#pragma pack(push, 8)
namespace
Json
{
/** \brief Configuration passed to reader and writer.
...
...
@@ -54,4 +56,6 @@ public:
}
// namespace Json
#pragma pack(pop)
#endif // CPPTL_JSON_FEATURES_H_INCLUDED
This diff is collapsed.
Click to expand it.
include/json/reader.h
View file @
d6e666f5
...
...
@@ -23,6 +23,8 @@
#pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8)
namespace
Json
{
/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
...
...
@@ -397,6 +399,8 @@ JSON_API JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM&, Value&);
}
// namespace Json
#pragma pack(pop)
#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma warning(pop)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
...
...
This diff is collapsed.
Click to expand it.
include/json/value.h
View file @
d6e666f5
...
...
@@ -42,6 +42,8 @@
#pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8)
/** \brief JSON (JavaScript Object Notation).
*/
namespace
Json
{
...
...
@@ -859,6 +861,7 @@ template<>
inline
void
swap
(
Json
::
Value
&
a
,
Json
::
Value
&
b
)
{
a
.
swap
(
b
);
}
}
#pragma pack(pop)
#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma warning(pop)
...
...
This diff is collapsed.
Click to expand it.
include/json/writer.h
View file @
d6e666f5
...
...
@@ -20,6 +20,8 @@
#pragma warning(disable : 4251)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma pack(push, 8)
namespace
Json
{
class
Value
;
...
...
@@ -324,6 +326,8 @@ JSON_API JSONCPP_OSTREAM& operator<<(JSONCPP_OSTREAM&, const Value& root);
}
// namespace Json
#pragma pack(pop)
#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
#pragma warning(pop)
#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help