From 0f66e144ab76a0b9bb418d645f81a2e80bdcb43d Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 8 Jun 2016 09:41:18 +0900 Subject: [PATCH] Support MSVC cli. MSVC CLI defined their own nullptr and provides for __nullptr for standard C++11. https://msdn.microsoft.com/en-us/library/4ex65770.aspx msgpack-c introduce MSGPACK_NULLPTR for internal use, it is defined as __nullptr only if compiled on C++ CLI otherwise defined as nullptr. --- erb/v1/cpp03_define_array.hpp.erb | 2 +- erb/v1/cpp03_define_map.hpp.erb | 2 +- erb/v1/cpp03_msgpack_tuple.hpp.erb | 2 +- erb/v1/cpp03_zone.hpp.erb | 6 +-- include/msgpack/adaptor/tr1/unordered_map.hpp | 4 +- include/msgpack/adaptor/tr1/unordered_set.hpp | 4 +- include/msgpack/v1/adaptor/array_ref.hpp | 6 +-- .../v1/adaptor/boost/msgpack_variant.hpp | 30 +++++------ include/msgpack/v1/adaptor/cpp11/array.hpp | 2 +- .../msgpack/v1/adaptor/cpp11/forward_list.hpp | 2 +- .../msgpack/v1/adaptor/cpp11/shared_ptr.hpp | 2 +- .../msgpack/v1/adaptor/cpp11/unique_ptr.hpp | 2 +- .../v1/adaptor/cpp11/unordered_map.hpp | 4 +- .../v1/adaptor/cpp11/unordered_set.hpp | 4 +- include/msgpack/v1/adaptor/deque.hpp | 2 +- .../v1/adaptor/detail/cpp03_define_array.hpp | 2 +- .../v1/adaptor/detail/cpp03_define_map.hpp | 2 +- .../v1/adaptor/detail/cpp03_msgpack_tuple.hpp | 2 +- include/msgpack/v1/adaptor/list.hpp | 2 +- include/msgpack/v1/adaptor/map.hpp | 6 +-- include/msgpack/v1/adaptor/raw.hpp | 2 +- include/msgpack/v1/adaptor/set.hpp | 4 +- .../msgpack/v1/adaptor/tr1/unordered_map.hpp | 4 +- .../msgpack/v1/adaptor/tr1/unordered_set.hpp | 4 +- include/msgpack/v1/adaptor/v4raw.hpp | 2 +- include/msgpack/v1/adaptor/vector.hpp | 2 +- include/msgpack/v1/adaptor/vector_bool.hpp | 2 +- include/msgpack/v1/cpp_config_decl.hpp | 20 +++++-- include/msgpack/v1/detail/cpp03_zone.hpp | 6 +-- include/msgpack/v1/detail/cpp11_zone.hpp | 14 ++--- include/msgpack/v1/object.hpp | 2 +- include/msgpack/v1/object_fwd.hpp | 2 +- include/msgpack/v1/sbuffer.hpp | 8 +-- include/msgpack/v1/unpack.hpp | 14 ++--- include/msgpack/v1/unpack_decl.hpp | 28 +++++----- include/msgpack/v1/vrefbuffer.hpp | 6 +-- include/msgpack/v1/zbuffer.hpp | 8 +-- include/msgpack/v2/object_fwd.hpp | 2 +- include/msgpack/v2/unpack.hpp | 16 +++--- include/msgpack/v2/unpack_decl.hpp | 24 ++++----- test/limit.cpp | 52 +++++++++---------- test/pack_unpack.cpp | 4 +- test/reference.cpp | 32 ++++++------ test/reference_cpp11.cpp | 16 +++--- 44 files changed, 186 insertions(+), 176 deletions(-) diff --git a/erb/v1/cpp03_define_array.hpp.erb b/erb/v1/cpp03_define_array.hpp.erb index 8ecca2fc..5cbab91b 100644 --- a/erb/v1/cpp03_define_array.hpp.erb +++ b/erb/v1/cpp03_define_array.hpp.erb @@ -38,7 +38,7 @@ struct define_array<> { void msgpack_object(msgpack::object* o, msgpack::zone&) const { o->type = msgpack::type::ARRAY; - o->via.array.ptr = nullptr; + o->via.array.ptr = MSGPACK_NULLPTR; o->via.array.size = 0; } }; diff --git a/erb/v1/cpp03_define_map.hpp.erb b/erb/v1/cpp03_define_map.hpp.erb index 9becd940..f7460554 100644 --- a/erb/v1/cpp03_define_map.hpp.erb +++ b/erb/v1/cpp03_define_map.hpp.erb @@ -38,7 +38,7 @@ struct define_map<> { void msgpack_object(msgpack::object* o, msgpack::zone&) const { o->type = msgpack::type::MAP; - o->via.map.ptr = nullptr; + o->via.map.ptr = MSGPACK_NULLPTR; o->via.map.size = 0; } }; diff --git a/erb/v1/cpp03_msgpack_tuple.hpp.erb b/erb/v1/cpp03_msgpack_tuple.hpp.erb index fbe716ba..1f6969c4 100644 --- a/erb/v1/cpp03_msgpack_tuple.hpp.erb +++ b/erb/v1/cpp03_msgpack_tuple.hpp.erb @@ -192,7 +192,7 @@ struct object_with_zone > { msgpack::object::with_zone& o, const type::tuple<>&) const { o.type = msgpack::type::ARRAY; - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } }; diff --git a/erb/v1/cpp03_zone.hpp.erb b/erb/v1/cpp03_zone.hpp.erb index 112a49e3..ad74b7d6 100644 --- a/erb/v1/cpp03_zone.hpp.erb +++ b/erb/v1/cpp03_zone.hpp.erb @@ -27,7 +27,7 @@ class zone { void* m_data; }; struct finalizer_array { - finalizer_array():m_tail(nullptr), m_end(nullptr), m_array(nullptr) {} + finalizer_array():m_tail(MSGPACK_NULLPTR), m_end(MSGPACK_NULLPTR), m_array(MSGPACK_NULLPTR) {} void call() { finalizer* fin = m_tail; for(; fin != m_array; --fin) (*(fin-1))(); @@ -93,7 +93,7 @@ class zone { m_head = c; m_free = chunk_size; m_ptr = reinterpret_cast(c) + sizeof(chunk); - c->m_next = nullptr; + c->m_next = MSGPACK_NULLPTR; } ~chunk_list() { @@ -117,7 +117,7 @@ class zone { break; } } - m_head->m_next = nullptr; + m_head->m_next = MSGPACK_NULLPTR; m_free = chunk_size; m_ptr = reinterpret_cast(m_head) + sizeof(chunk); } diff --git a/include/msgpack/adaptor/tr1/unordered_map.hpp b/include/msgpack/adaptor/tr1/unordered_map.hpp index 4236e298..62e77c11 100644 --- a/include/msgpack/adaptor/tr1/unordered_map.hpp +++ b/include/msgpack/adaptor/tr1/unordered_map.hpp @@ -80,7 +80,7 @@ struct object_with_zone void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -137,7 +137,7 @@ struct object_with_zone& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/adaptor/tr1/unordered_set.hpp b/include/msgpack/adaptor/tr1/unordered_set.hpp index a221a513..fcc76f3f 100644 --- a/include/msgpack/adaptor/tr1/unordered_set.hpp +++ b/include/msgpack/adaptor/tr1/unordered_set.hpp @@ -78,7 +78,7 @@ struct object_with_zone void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -132,7 +132,7 @@ struct object_with_zone& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/array_ref.hpp b/include/msgpack/v1/adaptor/array_ref.hpp index 3767c274..d6179484 100644 --- a/include/msgpack/v1/adaptor/array_ref.hpp +++ b/include/msgpack/v1/adaptor/array_ref.hpp @@ -26,7 +26,7 @@ namespace type { template struct array_ref { - array_ref() : data(nullptr) {} + array_ref() : data(MSGPACK_NULLPTR) {} array_ref(T& t) : data(&t) {} T* data; @@ -67,7 +67,7 @@ struct array_ref { template struct array_ref { - array_ref() : data(nullptr) {} + array_ref() : data(MSGPACK_NULLPTR) {} array_ref(T(&t)[N]) : data(t) {} T* data; @@ -248,7 +248,7 @@ struct object_with_zone > { if (!v.data) { throw msgpack::type_error(); } o.type = msgpack::type::ARRAY; if (v.data->empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { diff --git a/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp b/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp index e1d86346..84cf5801 100644 --- a/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp +++ b/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp @@ -115,51 +115,51 @@ struct basic_variant : basic_variant(unsigned long long v):base(uint64_t(v)) {} bool is_nil() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_bool() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_int64_t() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_uint64_t() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_double() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_string() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } #if (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 53 bool is_boost_string_ref() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } #endif // (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 53 bool is_vector_char() const { - return boost::get >(this) != nullptr; + return boost::get >(this) != MSGPACK_NULLPTR; } bool is_vector_char() { - return boost::get >(this) != nullptr; + return boost::get >(this) != MSGPACK_NULLPTR; } bool is_raw_ref() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_ext() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_ext_ref() const { - return boost::get(this) != nullptr; + return boost::get(this) != MSGPACK_NULLPTR; } bool is_vector() const { - return boost::get > >(this) != nullptr; + return boost::get > >(this) != MSGPACK_NULLPTR; } bool is_map() const { - return boost::get, basic_variant > >(this) != nullptr; + return boost::get, basic_variant > >(this) != MSGPACK_NULLPTR; } bool is_multimap() const { - return boost::get, basic_variant > >(this) != nullptr; + return boost::get, basic_variant > >(this) != MSGPACK_NULLPTR; } bool as_bool() const { diff --git a/include/msgpack/v1/adaptor/cpp11/array.hpp b/include/msgpack/v1/adaptor/cpp11/array.hpp index cc31798f..387401b9 100644 --- a/include/msgpack/v1/adaptor/cpp11/array.hpp +++ b/include/msgpack/v1/adaptor/cpp11/array.hpp @@ -115,7 +115,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::array& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/cpp11/forward_list.hpp b/include/msgpack/v1/adaptor/cpp11/forward_list.hpp index a806742a..395a1ff1 100644 --- a/include/msgpack/v1/adaptor/cpp11/forward_list.hpp +++ b/include/msgpack/v1/adaptor/cpp11/forward_list.hpp @@ -70,7 +70,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::forward_list& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(std::distance(v.begin(), v.end())); diff --git a/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp b/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp index 3f3ac688..f11d63d9 100644 --- a/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp +++ b/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp @@ -28,7 +28,7 @@ namespace adaptor { template struct as, typename std::enable_if::value>::type> { std::shared_ptr operator()(msgpack::object const& o) const { - if(o.is_nil()) return nullptr; + if(o.is_nil()) return MSGPACK_NULLPTR; return std::make_shared(o.as()); } }; diff --git a/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp b/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp index 6a96cc53..a175a84e 100644 --- a/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp +++ b/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp @@ -28,7 +28,7 @@ namespace adaptor { template struct as, typename std::enable_if::value>::type> { std::unique_ptr operator()(msgpack::object const& o) const { - if(o.is_nil()) return nullptr; + if(o.is_nil()) return MSGPACK_NULLPTR; return std::unique_ptr(new T(o.as())); } }; diff --git a/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp b/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp index ddd27e0c..e80a31a7 100644 --- a/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp +++ b/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp @@ -77,7 +77,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::unordered_map& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -151,7 +151,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::unordered_multimap& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp b/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp index 95d1c6fb..3e1da766 100644 --- a/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp +++ b/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp @@ -74,7 +74,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::unordered_set& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -143,7 +143,7 @@ struct object_with_zone> { void operator()(msgpack::object::with_zone& o, const std::unordered_multiset& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/deque.hpp b/include/msgpack/v1/adaptor/deque.hpp index c01f1812..6d42d6d8 100644 --- a/include/msgpack/v1/adaptor/deque.hpp +++ b/include/msgpack/v1/adaptor/deque.hpp @@ -79,7 +79,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::deque& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp index 7030d8e4..b35c21a7 100644 --- a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp +++ b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp @@ -38,7 +38,7 @@ struct define_array<> { void msgpack_object(msgpack::object* o, msgpack::zone&) const { o->type = msgpack::type::ARRAY; - o->via.array.ptr = nullptr; + o->via.array.ptr = MSGPACK_NULLPTR; o->via.array.size = 0; } }; diff --git a/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp b/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp index 071ac565..9e0acddd 100644 --- a/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp +++ b/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp @@ -38,7 +38,7 @@ struct define_map<> { void msgpack_object(msgpack::object* o, msgpack::zone&) const { o->type = msgpack::type::MAP; - o->via.map.ptr = nullptr; + o->via.map.ptr = MSGPACK_NULLPTR; o->via.map.size = 0; } }; diff --git a/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp b/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp index 4dabfe62..d21b7674 100644 --- a/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp +++ b/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp @@ -12964,7 +12964,7 @@ struct object_with_zone > { msgpack::object::with_zone& o, const type::tuple<>&) const { o.type = msgpack::type::ARRAY; - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } }; diff --git a/include/msgpack/v1/adaptor/list.hpp b/include/msgpack/v1/adaptor/list.hpp index 510d05c5..4d68065c 100644 --- a/include/msgpack/v1/adaptor/list.hpp +++ b/include/msgpack/v1/adaptor/list.hpp @@ -76,7 +76,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::list& v) const { o.type = msgpack::type::ARRAY; if (v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { diff --git a/include/msgpack/v1/adaptor/map.hpp b/include/msgpack/v1/adaptor/map.hpp index 9ab962ca..7b0fb832 100644 --- a/include/msgpack/v1/adaptor/map.hpp +++ b/include/msgpack/v1/adaptor/map.hpp @@ -104,7 +104,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const type::assoc_vector& v) const { o.type = msgpack::type::MAP; if (v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { @@ -189,7 +189,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::map& v) const { o.type = msgpack::type::MAP; if (v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { @@ -283,7 +283,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::multimap& v) const { o.type = msgpack::type::MAP; if (v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { diff --git a/include/msgpack/v1/adaptor/raw.hpp b/include/msgpack/v1/adaptor/raw.hpp index 921e4d63..80efdc78 100644 --- a/include/msgpack/v1/adaptor/raw.hpp +++ b/include/msgpack/v1/adaptor/raw.hpp @@ -24,7 +24,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) { namespace type { struct raw_ref { - raw_ref() : size(0), ptr(nullptr) {} + raw_ref() : size(0), ptr(MSGPACK_NULLPTR) {} raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {} uint32_t size; diff --git a/include/msgpack/v1/adaptor/set.hpp b/include/msgpack/v1/adaptor/set.hpp index f1b3d8ad..fb98f800 100644 --- a/include/msgpack/v1/adaptor/set.hpp +++ b/include/msgpack/v1/adaptor/set.hpp @@ -82,7 +82,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::set& v) const { o.type = msgpack::type::ARRAY; if (v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { @@ -159,7 +159,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::multiset& v) const { o.type = msgpack::type::ARRAY; if (v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/tr1/unordered_map.hpp b/include/msgpack/v1/adaptor/tr1/unordered_map.hpp index 4236e298..62e77c11 100644 --- a/include/msgpack/v1/adaptor/tr1/unordered_map.hpp +++ b/include/msgpack/v1/adaptor/tr1/unordered_map.hpp @@ -80,7 +80,7 @@ struct object_with_zone void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -137,7 +137,7 @@ struct object_with_zone& v) const { o.type = msgpack::type::MAP; if(v.empty()) { - o.via.map.ptr = nullptr; + o.via.map.ptr = MSGPACK_NULLPTR; o.via.map.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/tr1/unordered_set.hpp b/include/msgpack/v1/adaptor/tr1/unordered_set.hpp index a221a513..fcc76f3f 100644 --- a/include/msgpack/v1/adaptor/tr1/unordered_set.hpp +++ b/include/msgpack/v1/adaptor/tr1/unordered_set.hpp @@ -78,7 +78,7 @@ struct object_with_zone void operator()(msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); @@ -132,7 +132,7 @@ struct object_with_zone& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/adaptor/v4raw.hpp b/include/msgpack/v1/adaptor/v4raw.hpp index 6c20b057..f03f4a06 100644 --- a/include/msgpack/v1/adaptor/v4raw.hpp +++ b/include/msgpack/v1/adaptor/v4raw.hpp @@ -23,7 +23,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) { namespace type { struct v4raw_ref { - v4raw_ref() : size(0), ptr(nullptr) {} + v4raw_ref() : size(0), ptr(MSGPACK_NULLPTR) {} v4raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {} uint32_t size; diff --git a/include/msgpack/v1/adaptor/vector.hpp b/include/msgpack/v1/adaptor/vector.hpp index 8830d6eb..4b8f7724 100644 --- a/include/msgpack/v1/adaptor/vector.hpp +++ b/include/msgpack/v1/adaptor/vector.hpp @@ -84,7 +84,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::vector& v) const { o.type = msgpack::type::ARRAY; if (v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { diff --git a/include/msgpack/v1/adaptor/vector_bool.hpp b/include/msgpack/v1/adaptor/vector_bool.hpp index 112c1e34..d1b21361 100644 --- a/include/msgpack/v1/adaptor/vector_bool.hpp +++ b/include/msgpack/v1/adaptor/vector_bool.hpp @@ -61,7 +61,7 @@ struct object_with_zone > { void operator()(msgpack::object::with_zone& o, const std::vector& v) const { o.type = msgpack::type::ARRAY; if(v.empty()) { - o.via.array.ptr = nullptr; + o.via.array.ptr = MSGPACK_NULLPTR; o.via.array.size = 0; } else { uint32_t size = checked_get_container_size(v.size()); diff --git a/include/msgpack/v1/cpp_config_decl.hpp b/include/msgpack/v1/cpp_config_decl.hpp index c4b05a61..43a48600 100644 --- a/include/msgpack/v1/cpp_config_decl.hpp +++ b/include/msgpack/v1/cpp_config_decl.hpp @@ -25,11 +25,15 @@ #if defined(MSGPACK_USE_CPP03) -#if !defined(nullptr) -# if _MSC_VER < 1600 -# define nullptr (0) -# endif -#endif +#if defined(nullptr) +# if defined (__cplusplus_cli) +# define MSGPACK_NULLPTR __nullptr +# else // defined (__cplusplus_cli) +# define MSGPACK_NULLPTR nullptr +# endif // defined (__cplusplus_cli) +#else // defined(nullptr) +# define MSGPACK_NULLPTR (0) +#endif // defined(nullptr) #include @@ -85,6 +89,12 @@ struct is_pointer; #else // MSGPACK_USE_CPP03 +#if defined (__cplusplus_cli) +# define MSGPACK_NULLPTR __nullptr +#else // defined (__cplusplus_cli) +# define MSGPACK_NULLPTR nullptr +#endif // defined (__cplusplus_cli) + #include #include diff --git a/include/msgpack/v1/detail/cpp03_zone.hpp b/include/msgpack/v1/detail/cpp03_zone.hpp index 3e712de8..17bff2e2 100644 --- a/include/msgpack/v1/detail/cpp03_zone.hpp +++ b/include/msgpack/v1/detail/cpp03_zone.hpp @@ -27,7 +27,7 @@ class zone { void* m_data; }; struct finalizer_array { - finalizer_array():m_tail(nullptr), m_end(nullptr), m_array(nullptr) {} + finalizer_array():m_tail(MSGPACK_NULLPTR), m_end(MSGPACK_NULLPTR), m_array(MSGPACK_NULLPTR) {} void call() { finalizer* fin = m_tail; for(; fin != m_array; --fin) (*(fin-1))(); @@ -93,7 +93,7 @@ class zone { m_head = c; m_free = chunk_size; m_ptr = reinterpret_cast(c) + sizeof(chunk); - c->m_next = nullptr; + c->m_next = MSGPACK_NULLPTR; } ~chunk_list() { @@ -117,7 +117,7 @@ class zone { break; } } - m_head->m_next = nullptr; + m_head->m_next = MSGPACK_NULLPTR; m_free = chunk_size; m_ptr = reinterpret_cast(m_head) + sizeof(chunk); } diff --git a/include/msgpack/v1/detail/cpp11_zone.hpp b/include/msgpack/v1/detail/cpp11_zone.hpp index d332a90c..377e9072 100644 --- a/include/msgpack/v1/detail/cpp11_zone.hpp +++ b/include/msgpack/v1/detail/cpp11_zone.hpp @@ -33,7 +33,7 @@ private: void* m_data; }; struct finalizer_array { - finalizer_array():m_tail(nullptr), m_end(nullptr), m_array(nullptr) {} + finalizer_array():m_tail(MSGPACK_NULLPTR), m_end(MSGPACK_NULLPTR), m_array(MSGPACK_NULLPTR) {} void call() { finalizer* fin = m_tail; for(; fin != m_array; --fin) (*(fin-1))(); @@ -84,9 +84,9 @@ private: finalizer_array(finalizer_array&& other) noexcept :m_tail(other.m_tail), m_end(other.m_end), m_array(other.m_array) { - other.m_tail = nullptr; - other.m_end = nullptr; - other.m_array = nullptr; + other.m_tail = MSGPACK_NULLPTR; + other.m_end = MSGPACK_NULLPTR; + other.m_array = MSGPACK_NULLPTR; } finalizer_array& operator=(finalizer_array&& other) noexcept { @@ -117,7 +117,7 @@ private: m_head = c; m_free = chunk_size; m_ptr = reinterpret_cast(c) + sizeof(chunk); - c->m_next = nullptr; + c->m_next = MSGPACK_NULLPTR; } ~chunk_list() { @@ -141,14 +141,14 @@ private: break; } } - m_head->m_next = nullptr; + m_head->m_next = MSGPACK_NULLPTR; m_free = chunk_size; m_ptr = reinterpret_cast(m_head) + sizeof(chunk); } chunk_list(chunk_list&& other) noexcept :m_free(other.m_free), m_ptr(other.m_ptr), m_head(other.m_head) { - other.m_head = nullptr; + other.m_head = MSGPACK_NULLPTR; } chunk_list& operator=(chunk_list&& other) noexcept { diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp index 01e7bcaf..7e6dac14 100644 --- a/include/msgpack/v1/object.hpp +++ b/include/msgpack/v1/object.hpp @@ -179,7 +179,7 @@ inline std::size_t aligned_zone_size(msgpack::object const& obj) { */ inline object_handle clone(msgpack::object const& obj) { std::size_t size = msgpack::aligned_zone_size(obj); - msgpack::unique_ptr z(size == 0 ? nullptr : new msgpack::zone(size)); + msgpack::unique_ptr z(size == 0 ? MSGPACK_NULLPTR : new msgpack::zone(size)); msgpack::object newobj = z.get() ? msgpack::object(obj, *z) : obj; return object_handle(newobj, msgpack::move(z)); } diff --git a/include/msgpack/v1/object_fwd.hpp b/include/msgpack/v1/object_fwd.hpp index 1af7da09..66fe50ee 100644 --- a/include/msgpack/v1/object_fwd.hpp +++ b/include/msgpack/v1/object_fwd.hpp @@ -62,7 +62,7 @@ private: template static std::false_type check(...); public: - using type = decltype(check(nullptr)); + using type = decltype(check(MSGPACK_NULLPTR)); static constexpr bool value = type::value; }; diff --git a/include/msgpack/v1/sbuffer.hpp b/include/msgpack/v1/sbuffer.hpp index b60fe84c..387bdce2 100644 --- a/include/msgpack/v1/sbuffer.hpp +++ b/include/msgpack/v1/sbuffer.hpp @@ -26,7 +26,7 @@ public: sbuffer(size_t initsz = MSGPACK_SBUFFER_INIT_SIZE):m_size(0), m_alloc(initsz) { if(initsz == 0) { - m_data = nullptr; + m_data = MSGPACK_NULLPTR; } else { m_data = (char*)::malloc(initsz); if(!m_data) { @@ -48,7 +48,7 @@ public: m_size(other.m_size), m_data(other.m_data), m_alloc(other.m_alloc) { other.m_size = other.m_alloc = 0; - other.m_data = nullptr; + other.m_data = MSGPACK_NULLPTR; } sbuffer& operator=(sbuffer&& other) @@ -60,7 +60,7 @@ public: m_data = other.m_data; other.m_size = other.m_alloc = 0; - other.m_data = nullptr; + other.m_data = MSGPACK_NULLPTR; return *this; } @@ -94,7 +94,7 @@ public: { char* tmp = m_data; m_size = 0; - m_data = nullptr; + m_data = MSGPACK_NULLPTR; m_alloc = 0; return tmp; } diff --git a/include/msgpack/v1/unpack.hpp b/include/msgpack/v1/unpack.hpp index cc18b05c..dd87392a 100644 --- a/include/msgpack/v1/unpack.hpp +++ b/include/msgpack/v1/unpack.hpp @@ -133,8 +133,8 @@ namespace detail { class unpack_user { public: - unpack_user(unpack_reference_func f = nullptr, - void* user_data = nullptr, + unpack_user(unpack_reference_func f = MSGPACK_NULLPTR, + void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()) :m_func(f), m_user_data(user_data), m_limit(limit) {} msgpack::zone const& zone() const { return *m_zone; } @@ -538,7 +538,7 @@ inline int context::execute(const char* data, std::size_t len, std::size_t& off) m_start = data; m_current = data + off; const char* const pe = data + len; - const char* n = nullptr; + const char* n = MSGPACK_NULLPTR; msgpack::object obj; @@ -938,7 +938,7 @@ public: * */ unpacker(unpack_reference_func f = &unpacker::default_reference_func, - void* user_data = nullptr, + void* user_data = MSGPACK_NULLPTR, std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE, unpack_limit const& limit = unpack_limit()); @@ -1168,7 +1168,7 @@ inline unpacker::unpacker(unpacker&& other) m_z(std::move(other.m_z)), m_initial_buffer_size(other.m_initial_buffer_size), m_ctx(other.m_ctx) { - other.m_buffer = nullptr; + other.m_buffer = MSGPACK_NULLPTR; } inline unpacker& unpacker::operator=(unpacker&& other) { @@ -1345,7 +1345,7 @@ inline msgpack::object const& unpacker::data() inline msgpack::zone* unpacker::release_zone() { if(!flush_zone()) { - return nullptr; + return MSGPACK_NULLPTR; } msgpack::zone* r = new msgpack::zone; @@ -1419,7 +1419,7 @@ namespace detail { inline unpack_return unpack_imp(const char* data, std::size_t len, std::size_t& off, msgpack::zone& result_zone, msgpack::object& result, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()) { std::size_t noff = off; diff --git a/include/msgpack/v1/unpack_decl.hpp b/include/msgpack/v1/unpack_decl.hpp index 0a4c7d5d..f8fe2919 100644 --- a/include/msgpack/v1/unpack_decl.hpp +++ b/include/msgpack/v1/unpack_decl.hpp @@ -223,7 +223,7 @@ class unpacker; */ object_handle unpack( const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -239,7 +239,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -255,7 +255,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -270,7 +270,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. @@ -289,7 +289,7 @@ object_handle unpack( void unpack( object_handle& result, const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -306,7 +306,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -323,7 +323,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -339,7 +339,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -358,7 +358,7 @@ void unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -376,7 +376,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -394,7 +394,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -411,7 +411,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. [obsolete] @@ -429,8 +429,8 @@ msgpack::object unpack( */ void unpack( object_handle* result, - const char* data, std::size_t len, std::size_t* off = nullptr, bool* referenced = nullptr, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + const char* data, std::size_t len, std::size_t* off = MSGPACK_NULLPTR, bool* referenced = MSGPACK_NULLPTR, + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); // for internal use diff --git a/include/msgpack/v1/vrefbuffer.hpp b/include/msgpack/v1/vrefbuffer.hpp index d92648f7..ddc62a2c 100644 --- a/include/msgpack/v1/vrefbuffer.hpp +++ b/include/msgpack/v1/vrefbuffer.hpp @@ -81,7 +81,7 @@ public: ib->free = chunk_size; ib->ptr = reinterpret_cast(c) + sizeof(chunk); ib->head = c; - c->next = nullptr; + c->next = MSGPACK_NULLPTR; } @@ -188,7 +188,7 @@ public: throw std::bad_alloc(); } - empty->next = nullptr; + empty->next = MSGPACK_NULLPTR; const size_t nused = m_tail - m_array; if(to->m_tail + nused < m_end) { @@ -255,7 +255,7 @@ public: inner_buffer* const ib = &m_inner_buffer; c = ib->head; - c->next = nullptr; + c->next = MSGPACK_NULLPTR; ib->free = m_chunk_size; ib->ptr = reinterpret_cast(c) + sizeof(chunk); diff --git a/include/msgpack/v1/zbuffer.hpp b/include/msgpack/v1/zbuffer.hpp index de0abc70..e34b48ed 100644 --- a/include/msgpack/v1/zbuffer.hpp +++ b/include/msgpack/v1/zbuffer.hpp @@ -25,7 +25,7 @@ class zbuffer { public: zbuffer(int level = Z_DEFAULT_COMPRESSION, size_t init_size = MSGPACK_ZBUFFER_INIT_SIZE) - : m_data(nullptr), m_init_size(init_size) + : m_data(MSGPACK_NULLPTR), m_init_size(init_size) { m_stream.zalloc = Z_NULL; m_stream.zfree = Z_NULL; @@ -111,8 +111,8 @@ public: char* release_buffer() { char* tmp = m_data; - m_data = nullptr; - m_stream.next_out = nullptr; + m_data = MSGPACK_NULLPTR; + m_stream.next_out = MSGPACK_NULLPTR; m_stream.avail_out = 0; return tmp; } @@ -125,7 +125,7 @@ private: size_t nsize = (csize == 0) ? m_init_size : csize * 2; char* tmp = static_cast(::realloc(m_data, nsize)); - if(tmp == nullptr) { + if(tmp == MSGPACK_NULLPTR) { return false; } diff --git a/include/msgpack/v2/object_fwd.hpp b/include/msgpack/v2/object_fwd.hpp index 4ada56b5..69286608 100644 --- a/include/msgpack/v2/object_fwd.hpp +++ b/include/msgpack/v2/object_fwd.hpp @@ -94,7 +94,7 @@ private: template static std::false_type check(...); public: - using type = decltype(check(nullptr)); + using type = decltype(check(MSGPACK_NULLPTR)); static constexpr bool value = type::value; }; diff --git a/include/msgpack/v2/unpack.hpp b/include/msgpack/v2/unpack.hpp index 0c6c7a04..08cf2d5e 100644 --- a/include/msgpack/v2/unpack.hpp +++ b/include/msgpack/v2/unpack.hpp @@ -97,7 +97,7 @@ public: m_stack(std::move(other.m_stack)), m_zone(other.m_zone), m_referenced(other.m_referenced) { - other.m_zone = nullptr; + other.m_zone = MSGPACK_NULLPTR; m_stack[0] = &m_obj; } create_object_visitor& operator=(create_object_visitor&& other) { @@ -212,7 +212,7 @@ public: obj->type = msgpack::type::ARRAY; obj->via.array.size = num_elements; if (num_elements == 0) { - obj->via.array.ptr = nullptr; + obj->via.array.ptr = MSGPACK_NULLPTR; } else { obj->via.array.ptr = @@ -239,7 +239,7 @@ public: obj->type = msgpack::type::MAP; obj->via.map.size = num_kv_pairs; if (num_kv_pairs == 0) { - obj->via.map.ptr = nullptr; + obj->via.map.ptr = MSGPACK_NULLPTR; } else { obj->via.map.ptr = @@ -478,7 +478,7 @@ inline unpack_return context::execute(const char* data, std::size m_start = data; m_current = data + off; const char* const pe = data + len; - const char* n = nullptr; + const char* n = MSGPACK_NULLPTR; msgpack::object obj; @@ -1065,7 +1065,7 @@ inline parser::parser(this_type&& other) m_parsed(other.m_parsed), m_initial_buffer_size(other.m_initial_buffer_size), m_referenced_buffer_hook(other.m_referenced_buffer_hook) { - other.m_buffer = nullptr; + other.m_buffer = MSGPACK_NULLPTR; other.m_used = 0; other.m_free = 0; other.m_off = 0; @@ -1265,7 +1265,7 @@ class unpacker : public parser, typedef parser parser; public: unpacker(unpack_reference_func f = &unpacker::default_reference_func, - void* user_data = nullptr, + void* user_data = MSGPACK_NULLPTR, std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE, unpack_limit const& limit = unpack_limit()) :parser(m_finalizer, initial_buffer_size), @@ -1340,7 +1340,7 @@ inline bool unpacker::next(msgpack::object_handle& result) { inline msgpack::zone* unpacker::release_zone() { if(!flush_zone()) { - return nullptr; + return MSGPACK_NULLPTR; } msgpack::zone* r = new msgpack::zone; @@ -1599,7 +1599,7 @@ parse_imp(const char* data, size_t len, size_t& off, Visitor& v) { inline unpack_return unpack_imp(const char* data, std::size_t len, std::size_t& off, msgpack::zone& result_zone, msgpack::object& result, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()) { create_object_visitor v(f, user_data, limit); diff --git a/include/msgpack/v2/unpack_decl.hpp b/include/msgpack/v2/unpack_decl.hpp index 30540c62..61bdf036 100644 --- a/include/msgpack/v2/unpack_decl.hpp +++ b/include/msgpack/v2/unpack_decl.hpp @@ -110,7 +110,7 @@ typedef enum unpack_return { */ object_handle unpack( const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -126,7 +126,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -142,7 +142,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -157,7 +157,7 @@ object_handle unpack( */ object_handle unpack( const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. @@ -176,7 +176,7 @@ object_handle unpack( void unpack( object_handle& result, const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -193,7 +193,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -210,7 +210,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -226,7 +226,7 @@ void unpack( void unpack( object_handle& result, const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -245,7 +245,7 @@ void unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -263,7 +263,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, std::size_t& off, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -281,7 +281,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, bool& referenced, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack::object from a buffer. /** @@ -298,7 +298,7 @@ msgpack::object unpack( msgpack::object unpack( msgpack::zone& z, const char* data, std::size_t len, - unpack_reference_func f = nullptr, void* user_data = nullptr, unpack_limit const& limit = unpack_limit()); + unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit()); /// Unpack msgpack formatted data via a visitor /** diff --git a/test/limit.cpp b/test/limit.cpp index 8ae61996..93511ea3 100644 --- a/test/limit.cpp +++ b/test/limit.cpp @@ -12,7 +12,7 @@ TEST(limit, unpack_array_no_over) msgpack::pack(ss, v); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(3, 0, 0, 0, 0)); EXPECT_TRUE(true); } @@ -34,7 +34,7 @@ TEST(limit, unpack_array_over) msgpack::pack(ss, v); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -56,7 +56,7 @@ TEST(limit, unpack_map_no_over) msgpack::pack(ss, m); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 3, 0, 0, 0)); EXPECT_TRUE(true); } @@ -78,7 +78,7 @@ TEST(limit, unpack_map_over) msgpack::pack(ss, m); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 2, 0, 0, 0)); EXPECT_TRUE(false); } @@ -97,7 +97,7 @@ TEST(limit, unpack_str_no_over) msgpack::pack(ss, s); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 3, 0, 0)); EXPECT_TRUE(true); } @@ -116,7 +116,7 @@ TEST(limit, unpack_str_over) msgpack::pack(ss, s); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 2, 0, 0)); EXPECT_TRUE(false); } @@ -138,7 +138,7 @@ TEST(limit, unpack_bin_no_over) msgpack::pack(ss, v); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 3, 0)); EXPECT_TRUE(true); } @@ -160,7 +160,7 @@ TEST(limit, unpack_bin_over) msgpack::pack(ss, v); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 2, 0)); EXPECT_TRUE(false); } @@ -181,7 +181,7 @@ TEST(limit, unpack_ext_no_over) packer.pack_ext_body(buf, sizeof(buf)); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 0, 3+1)); EXPECT_TRUE(true); } @@ -202,7 +202,7 @@ TEST(limit, unpack_ext_over) packer.pack_ext_body(buf, sizeof(buf)); try { msgpack::object_handle oh = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 0, 2+1)); EXPECT_TRUE(false); } @@ -227,7 +227,7 @@ TEST(limit, unpack_ext_over_32_bit) }; try { msgpack::object_handle unp; - msgpack::unpack(unp, buf, sizeof(buf), nullptr, nullptr, + msgpack::unpack(unp, buf, sizeof(buf), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 0, 0xffffffff)); EXPECT_TRUE(false); } @@ -253,7 +253,7 @@ TEST(limit, unpack_ext_no_over_64_bit) }; try { msgpack::object_handle unp; - msgpack::unpack(unp, buf, sizeof(buf), nullptr, nullptr, + msgpack::unpack(unp, buf, sizeof(buf), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(0, 0, 0, 0, 0xffffffff)); EXPECT_TRUE(false); } @@ -279,7 +279,7 @@ TEST(limit, unpack_depth_no_over) msgpack::pack(ss, outer); try { msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(1, 0, 0, 0, 0, 2)); EXPECT_TRUE(true); } @@ -301,7 +301,7 @@ TEST(limit, unpack_depth_over) msgpack::pack(ss, outer); try { msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(1, 0, 0, 0, 0, 1)); EXPECT_TRUE(false); } @@ -327,7 +327,7 @@ TEST(limit, unpack_array_over_cpp11_no_off_no_ref) msgpack::pack(ss, v); try { msgpack::object_handle unp = - msgpack::unpack(ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -350,7 +350,7 @@ TEST(limit, unpack_array_over_cpp11_no_off_ref) try { bool ref; msgpack::object_handle unp = - msgpack::unpack(ss.str().c_str(), ss.str().size(), ref, nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -373,7 +373,7 @@ TEST(limit, unpack_array_over_cpp11_off_no_ref) try { std::size_t off = 0; msgpack::object_handle unp = - msgpack::unpack(ss.str().c_str(), ss.str().size(), off, nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), off, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -397,7 +397,7 @@ TEST(limit, unpack_array_over_cpp11_off_ref) bool ref; std::size_t off = 0; msgpack::object_handle unp = - msgpack::unpack(ss.str().c_str(), ss.str().size(), off, ref, nullptr, nullptr, + msgpack::unpack(ss.str().c_str(), ss.str().size(), off, ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -421,7 +421,7 @@ TEST(limit, unpack_array_over_no_off_no_ref) msgpack::pack(ss, v); try { msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -444,7 +444,7 @@ TEST(limit, unpack_array_over_no_off_ref) try { bool ref; msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), ref, nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -467,7 +467,7 @@ TEST(limit, unpack_array_over_off_no_ref) try { std::size_t off = 0; msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), off, nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), off, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -491,7 +491,7 @@ TEST(limit, unpack_array_over_off_ref) bool ref; std::size_t off = 0; msgpack::object_handle unp; - msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), off, ref, nullptr, nullptr, + msgpack::unpack(unp, ss.str().c_str(), ss.str().size(), off, ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -518,7 +518,7 @@ TEST(limit, unpack_array_over_off_ref_pointer) bool ref; std::size_t off = 0; msgpack::object_handle unp; - msgpack::unpack(&unp, ss.str().c_str(), ss.str().size(), &off, &ref, nullptr, nullptr, + msgpack::unpack(&unp, ss.str().c_str(), ss.str().size(), &off, &ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR, msgpack::unpack_limit(2, 0, 0, 0, 0)); EXPECT_TRUE(false); } @@ -541,7 +541,7 @@ TEST(limit, unpacker_array_over) v.push_back(3); msgpack::pack(ss, v); try { - msgpack::unpacker u(nullptr, nullptr, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, + msgpack::unpacker u(MSGPACK_NULLPTR, MSGPACK_NULLPTR, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, msgpack::unpack_limit(2, 0, 0, 0, 0)); u.reserve_buffer(ss.str().size()); memcpy(u.buffer(), ss.str().c_str(), ss.str().size()); @@ -560,7 +560,7 @@ TEST(limit, unpacker_array_over) TEST(limit, unpacker_reserve) { - msgpack::unpacker u(nullptr, nullptr, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, + msgpack::unpacker u(MSGPACK_NULLPTR, MSGPACK_NULLPTR, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, msgpack::unpack_limit()); std::size_t original_capacity = u.buffer_capacity(); u.reserve_buffer(original_capacity + 1u); @@ -569,7 +569,7 @@ TEST(limit, unpacker_reserve) TEST(limit, unpacker_reserve_more_than_twice) { - msgpack::unpacker u(nullptr, nullptr, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, + msgpack::unpacker u(MSGPACK_NULLPTR, MSGPACK_NULLPTR, MSGPACK_UNPACKER_INIT_BUFFER_SIZE, msgpack::unpack_limit()); std::size_t original_capacity = u.buffer_capacity(); u.reserve_buffer(original_capacity * 3); diff --git a/test/pack_unpack.cpp b/test/pack_unpack.cpp index 0af1e962..16ccc3f8 100644 --- a/test/pack_unpack.cpp +++ b/test/pack_unpack.cpp @@ -170,7 +170,7 @@ TEST(unpack, int_pointer_off_no_ref_explicit) std::size_t off = 0; // obsolete - msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, nullptr); + msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, MSGPACK_NULLPTR); EXPECT_EQ(1, oh.get().as()); EXPECT_EQ(off, sbuf.size()); } @@ -183,7 +183,7 @@ TEST(unpack, int_pointer_no_off_ref) bool referenced; // obsolete - msgpack::unpack(&oh, sbuf.data(), sbuf.size(), nullptr, &referenced); + msgpack::unpack(&oh, sbuf.data(), sbuf.size(), MSGPACK_NULLPTR, &referenced); EXPECT_EQ(1, oh.get().as()); EXPECT_EQ(false, referenced); } diff --git a/test/reference.cpp b/test/reference.cpp index d6195b99..d1ccbd55 100644 --- a/test/reference.cpp +++ b/test/reference.cpp @@ -140,12 +140,12 @@ TEST(reference, unpack_int_sized_ref) msgpack::pack(sbuf, 1); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, never_called, &sbuf); EXPECT_FALSE(referenced); - EXPECT_EQ(nullptr, s_p); + EXPECT_EQ(MSGPACK_NULLPTR, s_p); } TEST(reference, unpack_string_sized_ref_4) @@ -154,7 +154,7 @@ TEST(reference, unpack_string_sized_ref_4) msgpack::pack(sbuf, std::string("1234")); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; // the last argument sbuf is any pointer as a user data. // That is stored to s_p in sized_reference msgpack::object_handle oh = @@ -170,7 +170,7 @@ TEST(reference, unpack_string_sized_ref_5) msgpack::pack(sbuf, std::string("12345")); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); @@ -188,7 +188,7 @@ TEST(reference, unpack_bin_sized_ref_5) packer.pack_bin_body(c, sizeof(c)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); @@ -205,7 +205,7 @@ TEST(reference, unpack_bin_sized_ref_6) packer.pack_bin_body(c, sizeof(c)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_TRUE(referenced); @@ -222,7 +222,7 @@ TEST(reference, unpack_ext_sized_ref_6) packer.pack_ext_body(buf, sizeof(buf)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_FALSE(referenced); @@ -239,7 +239,7 @@ TEST(reference, unpack_ext_sized_ref_7) packer.pack_ext_body(buf, sizeof(buf)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_TRUE(referenced); @@ -333,11 +333,11 @@ TEST(reference, unpacker_int_sized_ref) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_FALSE(referenced); - EXPECT_EQ(nullptr, s_p); + EXPECT_EQ(MSGPACK_NULLPTR, s_p); } TEST(reference, unpacker_string_sized_ref_4) @@ -351,7 +351,7 @@ TEST(reference, unpacker_string_sized_ref_4) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_FALSE(referenced); @@ -369,7 +369,7 @@ TEST(reference, unpacker_string_sized_ref_5) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_TRUE(referenced); @@ -391,7 +391,7 @@ TEST(reference, unpacker_bin_sized_ref_5) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_FALSE(referenced); @@ -412,7 +412,7 @@ TEST(reference, unpacker_bin_sized_ref_6) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_TRUE(referenced); @@ -434,7 +434,7 @@ TEST(reference, unpacker_ext_sized_ref_6) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_FALSE(referenced); @@ -456,7 +456,7 @@ TEST(reference, unpacker_ext_sized_ref_7) unp.reserve_buffer(sbuf.size()); std::memcpy(unp.buffer(), sbuf.data(), sbuf.size()); unp.buffer_consumed(sbuf.size()); - s_p = nullptr; + s_p = MSGPACK_NULLPTR; bool b = unp.next(oh, referenced); EXPECT_TRUE(b); EXPECT_TRUE(referenced); diff --git a/test/reference_cpp11.cpp b/test/reference_cpp11.cpp index 59089515..531f4fa8 100644 --- a/test/reference_cpp11.cpp +++ b/test/reference_cpp11.cpp @@ -133,10 +133,10 @@ TEST(reference, unpack_int_sized_ref) msgpack::pack(sbuf, 1); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, never_called, &sbuf); EXPECT_FALSE(referenced); - EXPECT_EQ(nullptr, s_p); + EXPECT_EQ(MSGPACK_NULLPTR, s_p); } TEST(reference, unpack_string_sized_ref_4) @@ -145,7 +145,7 @@ TEST(reference, unpack_string_sized_ref_4) msgpack::pack(sbuf, std::string("1234")); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; // the last argument sbuf is any pointer as a user data. // That is stored to s_p in sized_reference msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); @@ -160,7 +160,7 @@ TEST(reference, unpack_string_sized_ref_5) msgpack::pack(sbuf, std::string("12345")); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_TRUE(referenced); EXPECT_EQ(&sbuf, s_p); @@ -176,7 +176,7 @@ TEST(reference, unpack_bin_sized_ref_5) packer.pack_bin_body(c, sizeof(c)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_FALSE(referenced); EXPECT_EQ(&sbuf, s_p); @@ -191,7 +191,7 @@ TEST(reference, unpack_bin_sized_ref_6) packer.pack_bin_body(c, sizeof(c)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_TRUE(referenced); EXPECT_EQ(&sbuf, s_p); @@ -207,7 +207,7 @@ TEST(reference, unpack_ext_sized_ref_6) packer.pack_ext_body(buf, sizeof(buf)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_FALSE(referenced); EXPECT_EQ(&sbuf, s_p); @@ -223,7 +223,7 @@ TEST(reference, unpack_ext_sized_ref_7) packer.pack_ext_body(buf, sizeof(buf)); bool referenced; - s_p = nullptr; + s_p = MSGPACK_NULLPTR; msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size(), referenced, sized_reference, &sbuf); EXPECT_TRUE(referenced); EXPECT_EQ(&sbuf, s_p);