diff --git a/v2_0_cpp_configure.md b/v2_0_cpp_configure.md index 80e6df8..ff13e86 100644 --- a/v2_0_cpp_configure.md +++ b/v2_0_cpp_configure.md @@ -11,11 +11,11 @@ Default value: not defined When you define MSGPACK_USE_DEFINE_MAP, MSGPACK_DEFINE is an alias of MSGPACK_DEFINE_MAP and MSGPACK_BASE is an alias of MSGPACK_BASE_MAP. If you doesn't defined, MSGPACK_DEFINE is an alias of MSGPACK_DEFINE_ARRAY and MSGPACK_BASE is an alias of MSGPACK_BASE_ARRAY. See [intrusive approach](v2_0_cpp_adaptor#intrusive-approach). -## MSGPACK_DISABLE_LEGACY_NIL (since 1.4.0) +## MSGPACK_USE_LEGACY_NIL (since 1.4.0) Default value: not defined -`msgpack::type::nil` is replaced with `msgpack::type::nil_t` to avoid conflict by [#408](https://github.com/msgpack/msgpack-c/pull/408). `nil` is defined by system on some environment. See #[368](https://github.com/msgpack/msgpack-c/pull/368) and [#406](https://github.com/msgpack/msgpack-c/pull/406). You need to replace `msgpack::type::nil` with `msgpack::type::nil_t` in your codes. However, you might want to continue to use nil. If `MSGPACK_DISABLE_LEGACY_NIL` is NOT defined, `msgpack::type::nil` is defined as the typedef of `msgpack::type::nil_t`. However, `msgpack::type::nil` is obsolete. It will be removed in the version 2.0.0. Please define `MSGPACK_DISABLE_LEGACY_NIL` to prepare the version 2.0.0. +`msgpack::type::nil` is replaced with `msgpack::type::nil_t` to avoid conflict by [#408](https://github.com/msgpack/msgpack-c/pull/408). `nil` is defined by system on some environment. See #[368](https://github.com/msgpack/msgpack-c/pull/368) and [#406](https://github.com/msgpack/msgpack-c/pull/406). `msgpack::type::nil` is obsolete. You need to replace `msgpack::type::nil` with `msgpack::type::nil_t` in your codes. However, you might want to continue to use nil. If `MSGPACK_USE_LEGACY_NIL` is defined, `msgpack::type::nil` is defined as the typedef of `msgpack::type::nil_t`. ## MSGPACK_DISABLE_LEGACY_CONVERT (since 1.4.0) diff --git a/v2_0_cpp_overview.md b/v2_0_cpp_overview.md index 39e5b09..e487e3e 100644 --- a/v2_0_cpp_overview.md +++ b/v2_0_cpp_overview.md @@ -13,7 +13,7 @@ git clone https://github.com/msgpack/msgpack-c.git cd msgpack-c Add msgpack-c/include as an include path for your project. ``` -g++ -Ipath_to_msgpack-c/include -DMSGPACK_DISABLE_LEGACY_NIL your_program.cpp +g++ -Ipath_to_msgpack-c/include your_program.cpp ``` See [MSGPACK_DISABLE_LEGACY_NIL](v2_0_cpp_configure#msgpack_disable_legacy_nil-since-140) @@ -24,7 +24,7 @@ When you set the C++11 or later compiler option, msgpack-c enables C++11 functionalities. ``` -g++ -std=c++11 -Ipath_to_msgpack-c/include -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT your_program.cpp +g++ -std=c++11 -Ipath_to_msgpack-c/include -DMSGPACK_DISABLE_LEGACY_CONVERT your_program.cpp ``` See [MSGPACK_DISABLE_LEGACY_NIL](v2_0_cpp_configure#msgpack_disable_legacy_nil-since-140) and [MSGPACK_DISABLE_LEGACY_CONVERT](v2_0_cpp_configure#msgpack_disable_legacy_convert-since-140).