Merge branch 'PhilJbt-patch-1' into cpp_master

This commit is contained in:
Takatoshi Kondo 2021-11-02 09:58:11 +09:00
commit 1f663d121e
6 changed files with 9 additions and 9 deletions

View File

@ -11,8 +11,8 @@
#ifndef MSGPACK_ITERATOR_HPP #ifndef MSGPACK_ITERATOR_HPP
#define MSGPACK_ITERATOR_HPP #define MSGPACK_ITERATOR_HPP
#include <msgpack/iterator_decl.hpp> #include "msgpack/iterator_decl.hpp"
#include <msgpack/v1/iterator.hpp> #include "msgpack/v1/iterator.hpp"
#endif // MSGPACK_ITERATOR_HPP #endif // MSGPACK_ITERATOR_HPP

View File

@ -11,8 +11,8 @@
#ifndef MSGPACK_ITERATOR_DECL_HPP #ifndef MSGPACK_ITERATOR_DECL_HPP
#define MSGPACK_ITERATOR_DECL_HPP #define MSGPACK_ITERATOR_DECL_HPP
#include <msgpack/v1/iterator_decl.hpp> #include "msgpack/v1/iterator_decl.hpp"
#include <msgpack/v2/iterator_decl.hpp> #include "msgpack/v2/iterator_decl.hpp"
#include <msgpack/v3/iterator_decl.hpp> #include "msgpack/v3/iterator_decl.hpp"
#endif // MSGPACK_ITERATOR_DECL_HPP #endif // MSGPACK_ITERATOR_DECL_HPP

View File

@ -12,7 +12,7 @@
#include <tuple> #include <tuple>
#include <msgpack/object_fwd.hpp> #include "msgpack/object_fwd.hpp"
namespace msgpack { namespace msgpack {
/// @cond /// @cond

View File

@ -12,7 +12,7 @@
#define MSGPACK_V1_ITERATOR_DECL_HPP #define MSGPACK_V1_ITERATOR_DECL_HPP
#if !defined(MSGPACK_USE_CPP03) #if !defined(MSGPACK_USE_CPP03)
#include <msgpack/object_fwd.hpp> #include "msgpack/object_fwd.hpp"
namespace msgpack { namespace msgpack {

View File

@ -12,7 +12,7 @@
#define MSGPACK_V2_ITERATOR_DECL_HPP #define MSGPACK_V2_ITERATOR_DECL_HPP
#if !defined(MSGPACK_USE_CPP03) #if !defined(MSGPACK_USE_CPP03)
#include <msgpack/v1/iterator_decl.hpp> #include "msgpack/v1/iterator_decl.hpp"
namespace msgpack { namespace msgpack {

View File

@ -12,7 +12,7 @@
#define MSGPACK_V3_ITERATOR_DECL_HPP #define MSGPACK_V3_ITERATOR_DECL_HPP
#if !defined(MSGPACK_USE_CPP03) #if !defined(MSGPACK_USE_CPP03)
#include <msgpack/v2/iterator_decl.hpp> #include "msgpack/v2/iterator_decl.hpp"
namespace msgpack { namespace msgpack {