From 683b6e42c63942df59e70d6659873c2e5d1dfdf4 Mon Sep 17 00:00:00 2001 From: Philippe Jaubert <22506952+PhilJbt@users.noreply.github.com> Date: Mon, 1 Nov 2021 15:27:17 +0100 Subject: [PATCH 1/2] Update iterator.hpp Can be a problem depending on the project folder nomenclature. --- include/msgpack/iterator.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msgpack/iterator.hpp b/include/msgpack/iterator.hpp index a118b592..0f532a4a 100644 --- a/include/msgpack/iterator.hpp +++ b/include/msgpack/iterator.hpp @@ -11,8 +11,8 @@ #ifndef MSGPACK_ITERATOR_HPP #define MSGPACK_ITERATOR_HPP -#include +#include "msgpack/iterator_decl.hpp" -#include +#include "msgpack/v1/iterator.hpp" #endif // MSGPACK_ITERATOR_HPP From 49bdd40eab67a73f4504db41f25f6fb4e1fa3dd1 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 2 Nov 2021 09:57:37 +0900 Subject: [PATCH 2/2] Fixed other similar include problems. --- include/msgpack/iterator_decl.hpp | 6 +++--- include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp | 2 +- include/msgpack/v1/iterator_decl.hpp | 2 +- include/msgpack/v2/iterator_decl.hpp | 2 +- include/msgpack/v3/iterator_decl.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/msgpack/iterator_decl.hpp b/include/msgpack/iterator_decl.hpp index 5bf28cb1..dc3205c8 100644 --- a/include/msgpack/iterator_decl.hpp +++ b/include/msgpack/iterator_decl.hpp @@ -11,8 +11,8 @@ #ifndef MSGPACK_ITERATOR_DECL_HPP #define MSGPACK_ITERATOR_DECL_HPP -#include -#include -#include +#include "msgpack/v1/iterator_decl.hpp" +#include "msgpack/v2/iterator_decl.hpp" +#include "msgpack/v3/iterator_decl.hpp" #endif // MSGPACK_ITERATOR_DECL_HPP diff --git a/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp b/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp index f9e29ea6..d182e79f 100644 --- a/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp +++ b/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp @@ -12,7 +12,7 @@ #include -#include +#include "msgpack/object_fwd.hpp" namespace msgpack { /// @cond diff --git a/include/msgpack/v1/iterator_decl.hpp b/include/msgpack/v1/iterator_decl.hpp index 1bec2e38..9ae68785 100644 --- a/include/msgpack/v1/iterator_decl.hpp +++ b/include/msgpack/v1/iterator_decl.hpp @@ -12,7 +12,7 @@ #define MSGPACK_V1_ITERATOR_DECL_HPP #if !defined(MSGPACK_USE_CPP03) -#include +#include "msgpack/object_fwd.hpp" namespace msgpack { diff --git a/include/msgpack/v2/iterator_decl.hpp b/include/msgpack/v2/iterator_decl.hpp index c03a3939..49268f64 100644 --- a/include/msgpack/v2/iterator_decl.hpp +++ b/include/msgpack/v2/iterator_decl.hpp @@ -12,7 +12,7 @@ #define MSGPACK_V2_ITERATOR_DECL_HPP #if !defined(MSGPACK_USE_CPP03) -#include +#include "msgpack/v1/iterator_decl.hpp" namespace msgpack { diff --git a/include/msgpack/v3/iterator_decl.hpp b/include/msgpack/v3/iterator_decl.hpp index 999eb3be..fb7b103b 100644 --- a/include/msgpack/v3/iterator_decl.hpp +++ b/include/msgpack/v3/iterator_decl.hpp @@ -12,7 +12,7 @@ #define MSGPACK_V3_ITERATOR_DECL_HPP #if !defined(MSGPACK_USE_CPP03) -#include +#include "msgpack/v2/iterator_decl.hpp" namespace msgpack {