diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-03-15 10:50:36 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-03-15 10:50:36 -0400 |
| commit | d1cf16364fb1901c2940ce66024688ea3fe3fc48 (patch) | |
| tree | a46cc2528358e43da2d7c24eda9d4f82b3eb42e3 | |
| parent | Merge pull request #6383 (diff) | |
| parent | workaround for GetObject windows.h macro and rapidjson conflict (diff) | |
| download | monero-d1cf16364fb1901c2940ce66024688ea3fe3fc48.tar.xz | |
Merge pull request #6388
c075aa7 workaround for GetObject windows.h macro and rapidjson conflict (xiphon)
Diffstat (limited to '')
| -rw-r--r-- | src/serialization/json_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialization/json_object.h b/src/serialization/json_object.h index d2c579589..a1a5105d5 100644 --- a/src/serialization/json_object.h +++ b/src/serialization/json_object.h @@ -30,11 +30,11 @@ #include <boost/utility/string_ref.hpp> #include <cstring> +#include "string_tools.h" // out of order because windows.h GetObject macro conflicts with GenericValue<..>::GetObject() #include <rapidjson/document.h> #include <rapidjson/stringbuffer.h> #include <rapidjson/writer.h> -#include "string_tools.h" #include "cryptonote_basic/cryptonote_basic.h" #include "rpc/message_data_structs.h" #include "cryptonote_protocol/cryptonote_protocol_defs.h" |