Skip to content

Commit 54cb435

Browse files
redboltzredboltz
committed
Re-organized tree to prepare for version 2.0.0.
See https://github.com/msgpack/msgpack-c/wiki/v1_1_cpp_versioning
1 parent cabd8a8 commit 54cb435

File tree

222 files changed

+16017
-10672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+16017
-10672
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ install:
3636
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then unzip -q gtest-1.7.0.zip && cd gtest-1.7.0 && sudo cp -r include/gtest /usr/local/include && clang++ src/gtest-all.cc -I. -Iinclude -c && g++ src/gtest_main.cc -I. -Iinclude -c && ar -rv libgtest.a gtest-all.o && ar -rv libgtest_main.a gtest_main.o && sudo mv *.a /usr/local/lib && cd ..; fi
3737

3838
env:
39-
- ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned"
40-
- ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed"
41-
- ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="signed"
42-
- ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned"
43-
- ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="signed"
44-
- ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned"
45-
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="unsigned"
46-
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed"
39+
- ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="1"
40+
- ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed" API_VERSION="2"
41+
- ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="signed" API_VERSION="2"
42+
- ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned" API_VERSION="2"
43+
- ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="signed" API_VERSION="2"
44+
- ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="2"
45+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="unsigned" API_VERSION="2"
46+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="1"
47+
- ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="2"
4748

4849
before_script:
4950
- export PATH=/usr/local/bin:$PATH && rm -rf install
@@ -53,39 +54,50 @@ matrix:
5354
- os: osx
5455
compiler: gcc
5556
- os: osx
56-
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed"
57+
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="1"
5758
- os: osx
58-
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned"
59+
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed" API_VERSION="2"
5960
- os: osx
60-
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned"
61+
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned" API_VERSION="2"
6162
- os: osx
62-
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed"
63+
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="2"
64+
- os: osx
65+
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="2"
6366

6467
- os: linux
6568
compiler: gcc
66-
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned"
69+
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="1"
70+
- os: linux
71+
compiler: gcc
72+
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="2"
6773
- os: linux
6874
compiler: gcc
69-
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed"
75+
env: ACTION="ci/build_autotools.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" CHAR_SIGN="signed" API_VERSION="2"
7076
- os: linux
7177
compiler: gcc
72-
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="signed"
78+
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="signed" API_VERSION="2"
7379
- os: linux
7480
compiler: gcc
75-
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned"
81+
env: ACTION="ci/build_cmake.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="" BOOST_INC="" SHARED="OFF" CHAR_SIGN="unsigned" API_VERSION="2"
7682

7783
- os: linux
7884
compiler: clang
79-
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="signed"
85+
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="signed" API_VERSION="2"
86+
- os: linux
87+
compiler: clang
88+
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="2"
89+
- os: linux
90+
compiler: clang
91+
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned" API_VERSION="2"
8092
- os: linux
8193
compiler: clang
82-
env: ACTION="ci/build_autotools.sh" VERSION="cpp11" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" CHAR_SIGN="unsigned"
94+
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="unsigned" API_VERSION="2"
8395
- os: linux
8496
compiler: clang
85-
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="64" LIBPATH="/usr/local/lib" BOOST="" BOOST_INC="" CHAR_SIGN="unsigned"
97+
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="1"
8698
- os: linux
8799
compiler: clang
88-
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed"
100+
env: ACTION="ci/build_cmake.sh" VERSION="cpp03" ARCH="32" LIBPATH="/usr/local/lib32" BOOST="boost" BOOST_INC="/usr/local/boost" SHARED="OFF" CHAR_SIGN="signed" API_VERSION="2"
89101

90102
script:
91103
- git clean -xdf && CMAKE_LIBRARY_PATH=${LIBPATH} ${ACTION} ${VERSION} ${ARCH} ${BOOST} ${BOOST_INC} ${CHAR_SIGN}

‎CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ IF (MSGPACK_CHAR_SIGN)
8989
SET (CMAKE_CXX_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_CXX_FLAGS}")
9090
ENDIF ()
9191

92+
IF (MSGPACK_DEFAULT_API_VERSION)
93+
SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION} ${CMAKE_CXX_FLAGS}")
94+
ELSE ()
95+
SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=2 ${CMAKE_CXX_FLAGS}")
96+
ENDIF ()
97+
9298
FILE (GLOB_RECURSE PREDEF_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost/*.h)
9399
FOREACH (F ${PREDEF_FILES})
94100
SET(M "Converting ${F}")

‎ci/build_autotools.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ else
2828
boost=""
2929
fi
3030

31-
./configure CFLAGS="$bit32 -f${CHAR_SIGN}-char" CXXFLAGS="$bit32 -f${CHAR_SIGN}-char $cpp11 $boost -I$4"
31+
./configure CFLAGS="$bit32 -f${CHAR_SIGN}-char" CXXFLAGS="$bit32 -f${CHAR_SIGN}-char $cpp11 $boost -I$4 -DMSGPACK_DEFAULT_API_VERSION=${API_VERSION}"
3232

3333
ret=$?
3434
if [ $ret -ne 0 ]

‎ci/build_cmake.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ else
5151
shared=""
5252
fi
5353

54-
cmake $cpp11 $bit32 $boost $boost_dir $shared -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} ..
54+
cmake $cpp11 $bit32 $boost $boost_dir $shared -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DMSGPACK_DEFAULT_API_VERSION=${API_VERSION} ..
5555

5656
ret=$?
5757
if [ $ret -ne 0 ]

erb/cpp03_define_array.hpp.erb renamed to erb/v1/cpp03_define_array.hpp.erb

Lines changed: 5 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,27 @@
11
//
22
// MessagePack for C++ static resolution routine
33
//
4-
// Copyright (C) 2008-2009 FURUHASHI Sadayuki
4+
// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
55
//
66
// Distributed under the Boost Software License, Version 1.0.
77
// (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99
//
10-
#ifndef MSGPACK_CPP03_DEFINE_ARRAY_HPP
11-
#define MSGPACK_CPP03_DEFINE_ARRAY_HPP
10+
#ifndef MSGPACK_V1_CPP03_DEFINE_ARRAY_HPP
11+
#define MSGPACK_V1_CPP03_DEFINE_ARRAY_HPP
1212

13-
#include "msgpack/versioning.hpp"
13+
#include "msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp"
1414
#include "msgpack/adaptor/msgpack_tuple.hpp"
1515
#include "msgpack/adaptor/adaptor_base.hpp"
1616
#include "msgpack/object_fwd.hpp"
1717

18-
#define MSGPACK_DEFINE_ARRAY(...) \
19-
template <typename Packer> \
20-
void msgpack_pack(Packer& pk) const \
21-
{ \
22-
msgpack::type::make_define_array(__VA_ARGS__).msgpack_pack(pk); \
23-
} \
24-
void msgpack_unpack(msgpack::object const& o) \
25-
{ \
26-
msgpack::type::make_define_array(__VA_ARGS__).msgpack_unpack(o); \
27-
}\
28-
template <typename MSGPACK_OBJECT> \
29-
void msgpack_object(MSGPACK_OBJECT* o, msgpack::zone& z) const \
30-
{ \
31-
msgpack::type::make_define_array(__VA_ARGS__).msgpack_object(o, z); \
32-
}
33-
34-
#define MSGPACK_BASE_ARRAY(base) (*const_cast<base *>(static_cast<base const*>(this)))
35-
36-
// MSGPACK_ADD_ENUM must be used in the global namespace.
37-
#define MSGPACK_ADD_ENUM(enum_name) \
38-
namespace msgpack { \
39-
/** @cond */ \
40-
MSGPACK_API_VERSION_NAMESPACE(v1) { \
41-
/** @endcond */ \
42-
namespace adaptor { \
43-
template<> \
44-
struct convert<enum_name> { \
45-
msgpack::object const& operator()(msgpack::object const& o, enum_name& v) const {\
46-
int tmp; \
47-
o >> tmp; \
48-
v = static_cast<enum_name>(tmp); \
49-
return o; \
50-
} \
51-
}; \
52-
template<> \
53-
struct object<enum_name> { \
54-
void operator()(msgpack::object& o, const enum_name& v) const {\
55-
o << static_cast<int>(v); \
56-
} \
57-
}; \
58-
template<> \
59-
struct object_with_zone<enum_name> { \
60-
void operator()(msgpack::object::with_zone& o, const enum_name& v) const { \
61-
o << static_cast<int>(v); \
62-
} \
63-
}; \
64-
template<> \
65-
struct pack<enum_name> { \
66-
template <typename Stream> \
67-
msgpack::packer<Stream>& operator()(msgpack::packer<Stream>& o, const enum_name& v) const { \
68-
return o << static_cast<int>(v); \
69-
} \
70-
}; \
71-
} \
72-
/** @cond */ \
73-
} \
74-
/** @endcond */ \
75-
}
76-
7718
namespace msgpack {
7819
/// @cond
7920
MSGPACK_API_VERSION_NAMESPACE(v1) {
8021
/// @endcond
8122
namespace type {
8223

83-
/// @cond
8424
<% GENERATION_LIMIT = 31 %>
85-
template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
86-
struct define_array;
87-
/// @endcond
88-
8925
template <>
9026
struct define_array<> {
9127
typedef define_array<> value_type;
@@ -169,5 +105,4 @@ inline define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_array(A0& a0
169105
/// @endcond
170106
} // namespace msgpack
171107

172-
173-
#endif // MSGPACK_CPP03_DEFINE_ARRAY_HPP
108+
#endif // MSGPACK_V1_CPP03_DEFINE_ARRAY_HPP

‎erb/v1/cpp03_define_array_decl.hpp.erb‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//
2+
// MessagePack for C++ static resolution routine
3+
//
4+
// Copyright (C) 2008-2016 FURUHASHI Sadayuki and KONDO Takatoshi
5+
//
6+
// Distributed under the Boost Software License, Version 1.0.
7+
// (See accompanying file LICENSE_1_0.txt or copy at
8+
// http://www.boost.org/LICENSE_1_0.txt)
9+
//
10+
#ifndef MSGPACK_V1_CPP03_DEFINE_ARRAY_DECL_HPP
11+
#define MSGPACK_V1_CPP03_DEFINE_ARRAY_DECL_HPP
12+
13+
#include "msgpack/versioning.hpp"
14+
15+
namespace msgpack {
16+
/// @cond
17+
MSGPACK_API_VERSION_NAMESPACE(v1) {
18+
/// @endcond
19+
namespace type {
20+
21+
/// @cond
22+
<% GENERATION_LIMIT = 31 %>
23+
template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
24+
struct define_array;
25+
/// @endcond
26+
27+
define_array<> make_define_array();
28+
29+
/// @cond
30+
<%0.upto(GENERATION_LIMIT) {|i|%>
31+
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
32+
inline define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_array(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>);
33+
<%}%>
34+
/// @endcond
35+
36+
} // namespace type
37+
/// @cond
38+
} // MSGPACK_API_VERSION_NAMESPACE(v1)
39+
/// @endcond
40+
} // namespace msgpack
41+
42+
#endif // MSGPACK_V1_CPP03_DEFINE_ARRAY_DECL_HPP

erb/cpp03_define_map.hpp.erb renamed to erb/v1/cpp03_define_map.hpp.erb

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,27 @@
11
//
22
// MessagePack for C++ static resolution routine
33
//
4-
// Copyright (C) 2015 KONDO Takatoshi
4+
// Copyright (C) 2015-2016 KONDO Takatoshi
55
//
66
// Distributed under the Boost Software License, Version 1.0.
77
// (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99
//
10-
#ifndef MSGPACK_CPP03_DEFINE_MAP_HPP
11-
#define MSGPACK_CPP03_DEFINE_MAP_HPP
10+
#ifndef MSGPACK_V1_CPP03_DEFINE_MAP_HPP
11+
#define MSGPACK_V1_CPP03_DEFINE_MAP_HPP
1212

13-
// BOOST_PP_VARIADICS is defined in boost/preprocessor/config/config.hpp
14-
// http://www.boost.org/libs/preprocessor/doc/ref/variadics.html
15-
// However, supporting compiler detection is not complete. msgpack-c requires
16-
// variadic macro arguments support. So BOOST_PP_VARIADICS is defined here explicitly.
17-
#if !defined(MSGPACK_PP_VARIADICS)
18-
#define MSGPACK_PP_VARIADICS
19-
#endif
20-
21-
#include <msgpack/preprocessor.hpp>
22-
23-
#include "msgpack/versioning.hpp"
13+
#include "msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp"
2414
#include "msgpack/adaptor/msgpack_tuple.hpp"
2515
#include "msgpack/adaptor/adaptor_base.hpp"
2616
#include "msgpack/object_fwd.hpp"
2717

28-
#define MSGPACK_DEFINE_MAP_EACH_PROC(r, data, elem) \
29-
MSGPACK_PP_IF( \
30-
MSGPACK_PP_IS_BEGIN_PARENS(elem), \
31-
elem, \
32-
(MSGPACK_PP_STRINGIZE(elem))(elem) \
33-
)
34-
35-
#define MSGPACK_DEFINE_MAP_IMPL(...) \
36-
MSGPACK_PP_SEQ_TO_TUPLE( \
37-
MSGPACK_PP_SEQ_FOR_EACH( \
38-
MSGPACK_DEFINE_MAP_EACH_PROC, \
39-
0, \
40-
MSGPACK_PP_VARIADIC_TO_SEQ(__VA_ARGS__) \
41-
) \
42-
)
43-
44-
#define MSGPACK_DEFINE_MAP(...) \
45-
template <typename Packer> \
46-
void msgpack_pack(Packer& pk) const \
47-
{ \
48-
msgpack::type::make_define_map \
49-
MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
50-
.msgpack_pack(pk); \
51-
} \
52-
void msgpack_unpack(msgpack::object const& o) \
53-
{ \
54-
msgpack::type::make_define_map \
55-
MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
56-
.msgpack_unpack(o); \
57-
}\
58-
template <typename MSGPACK_OBJECT> \
59-
void msgpack_object(MSGPACK_OBJECT* o, msgpack::zone& z) const \
60-
{ \
61-
msgpack::type::make_define_map \
62-
MSGPACK_DEFINE_MAP_IMPL(__VA_ARGS__) \
63-
.msgpack_object(o, z); \
64-
}
65-
66-
#define MSGPACK_BASE_MAP(base) \
67-
(MSGPACK_PP_STRINGIZE(base))(*const_cast<base *>(static_cast<base const*>(this)))
68-
6918
namespace msgpack {
7019
/// @cond
7120
MSGPACK_API_VERSION_NAMESPACE(v1) {
7221
/// @endcond
7322
namespace type {
7423

75-
/// @cond
7624
<% GENERATION_LIMIT = 31 %>
77-
template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
78-
struct define_map;
79-
/// @endcond
80-
8125
template <>
8226
struct define_map<> {
8327
template <typename Packer>
@@ -170,4 +114,4 @@ inline define_map<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define_map(A0& a0<%1.
170114
/// @endcond
171115
} // namespace msgpack
172116

173-
#endif // MSGPACK_CPP03_DEFINE_MAP_HPP
117+
#endif // MSGPACK_V1_CPP03_DEFINE_MAP_HPP

0 commit comments

Comments
 (0)