From 5ecb797d8a24489ece8c1a03dc445719e5154bee Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Fri, 18 Mar 2016 09:40:34 +0900 Subject: [PATCH] type::nil is defined only if MSGPACK_USE_LEGACY_NIL in v2. Note: In v1, type::nil is defined if NOT defined MSGPACK_DISABLE_LEGACY_NIL. --- include/msgpack/v2/adaptor/nil_decl.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msgpack/v2/adaptor/nil_decl.hpp b/include/msgpack/v2/adaptor/nil_decl.hpp index f87eee1b..b94c4c69 100644 --- a/include/msgpack/v2/adaptor/nil_decl.hpp +++ b/include/msgpack/v2/adaptor/nil_decl.hpp @@ -22,6 +22,12 @@ namespace type { using v1::type::nil_t; +#if defined(MSGPACK_USE_LEGACY_NIL) + +typedef nil_t nil; + +#endif // defined(MSGPACK_USE_LEGACY_NIL) + using v1::type::operator<; using v1::type::operator==;