From fe82444db11ab5e3266aa2e3faaf67b627e12ca5 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 11 Sep 2013 11:21:11 +0900 Subject: [PATCH] Replaced NULL with nullptr. --- src/msgpack/type/define.hpp.erb | 2 +- src/msgpack/type/deque.hpp | 2 +- src/msgpack/type/list.hpp | 2 +- src/msgpack/type/map.hpp | 6 +++--- src/msgpack/type/raw.hpp | 2 +- src/msgpack/type/set.hpp | 4 ++-- src/msgpack/type/tr1/unordered_map.hpp | 4 ++-- src/msgpack/type/tr1/unordered_set.hpp | 4 ++-- src/msgpack/type/tuple.hpp.erb | 2 +- src/msgpack/type/vector.hpp | 2 +- src/msgpack/unpack.hpp | 16 ++++++++-------- src/msgpack/zbuffer.hpp | 6 +++--- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/msgpack/type/define.hpp.erb b/src/msgpack/type/define.hpp.erb index bf1f4226..8a234256 100644 --- a/src/msgpack/type/define.hpp.erb +++ b/src/msgpack/type/define.hpp.erb @@ -85,7 +85,7 @@ struct define<> { void msgpack_object(msgpack::object* o, msgpack::zone* z) const { o->type = type::ARRAY; - o->via.array.ptr = NULL; + o->via.array.ptr = nullptr; o->via.array.size = 0; } }; diff --git a/src/msgpack/type/deque.hpp b/src/msgpack/type/deque.hpp index a7c57b03..b3895f70 100644 --- a/src/msgpack/type/deque.hpp +++ b/src/msgpack/type/deque.hpp @@ -54,7 +54,7 @@ inline void operator<< (object::with_zone& o, const std::deque& v) { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); diff --git a/src/msgpack/type/list.hpp b/src/msgpack/type/list.hpp index 30f78d62..03ae9d15 100644 --- a/src/msgpack/type/list.hpp +++ b/src/msgpack/type/list.hpp @@ -54,7 +54,7 @@ inline void operator<< (object::with_zone& o, const std::list& v) { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); diff --git a/src/msgpack/type/map.hpp b/src/msgpack/type/map.hpp index 39d64a08..efbd5210 100644 --- a/src/msgpack/type/map.hpp +++ b/src/msgpack/type/map.hpp @@ -75,7 +75,7 @@ inline void operator<< (object::with_zone& o, const type::assoc_vector& v) { o.type = type::MAP; if(v.empty()) { - o.via.map.ptr = NULL; + o.via.map.ptr = nullptr; o.via.map.size = 0; } else { object_kv* p = static_cast(o.zone->malloc(sizeof(object_kv)*v.size())); @@ -131,7 +131,7 @@ inline void operator<< (object::with_zone& o, const std::map& v) { o.type = type::MAP; if(v.empty()) { - o.via.map.ptr = NULL; + o.via.map.ptr = nullptr; o.via.map.size = 0; } else { object_kv* p = static_cast(o.zone->malloc(sizeof(object_kv)*v.size())); @@ -181,7 +181,7 @@ inline void operator<< (object::with_zone& o, const std::multimap& v) { o.type = type::MAP; if(v.empty()) { - o.via.map.ptr = NULL; + o.via.map.ptr = nullptr; o.via.map.size = 0; } else { object_kv* p = static_cast(o.zone->malloc(sizeof(object_kv)*v.size())); diff --git a/src/msgpack/type/raw.hpp b/src/msgpack/type/raw.hpp index efe2d21c..07aae119 100644 --- a/src/msgpack/type/raw.hpp +++ b/src/msgpack/type/raw.hpp @@ -27,7 +27,7 @@ namespace msgpack { namespace type { struct raw_ref { - raw_ref() : size(0), ptr(NULL) {} + raw_ref() : size(0), ptr(nullptr) {} raw_ref(const char* p, uint32_t s) : size(s), ptr(p) {} uint32_t size; diff --git a/src/msgpack/type/set.hpp b/src/msgpack/type/set.hpp index 9b862131..506732e4 100644 --- a/src/msgpack/type/set.hpp +++ b/src/msgpack/type/set.hpp @@ -53,7 +53,7 @@ inline void operator<< (object::with_zone& o, const std::set& v) { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); @@ -99,7 +99,7 @@ inline void operator<< (object::with_zone& o, const std::multiset& v) { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); diff --git a/src/msgpack/type/tr1/unordered_map.hpp b/src/msgpack/type/tr1/unordered_map.hpp index 23168f4e..b652c3f6 100644 --- a/src/msgpack/type/tr1/unordered_map.hpp +++ b/src/msgpack/type/tr1/unordered_map.hpp @@ -74,7 +74,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m { o.type = type::MAP; if(v.empty()) { - o.via.map.ptr = NULL; + o.via.map.ptr = nullptr; o.via.map.size = 0; } else { object_kv* p = static_cast(o.zone->malloc(sizeof(object_kv)*v.size())); @@ -124,7 +124,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m { o.type = type::MAP; if(v.empty()) { - o.via.map.ptr = NULL; + o.via.map.ptr = nullptr; o.via.map.size = 0; } else { object_kv* p = static_cast(o.zone->malloc(sizeof(object_kv)*v.size())); diff --git a/src/msgpack/type/tr1/unordered_set.hpp b/src/msgpack/type/tr1/unordered_set.hpp index 63f37045..985dec6a 100644 --- a/src/msgpack/type/tr1/unordered_set.hpp +++ b/src/msgpack/type/tr1/unordered_set.hpp @@ -71,7 +71,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_s { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); @@ -117,7 +117,7 @@ inline void operator<< (object::with_zone& o, const MSGPACK_STD_TR1::unordered_m { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); diff --git a/src/msgpack/type/tuple.hpp.erb b/src/msgpack/type/tuple.hpp.erb index bf9cf8e0..6eb0cf5f 100644 --- a/src/msgpack/type/tuple.hpp.erb +++ b/src/msgpack/type/tuple.hpp.erb @@ -175,7 +175,7 @@ inline void operator<< ( object::with_zone& o, const type::tuple<>& v) { o.type = type::ARRAY; - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } <%0.upto(GENERATION_LIMIT) {|i|%> diff --git a/src/msgpack/type/vector.hpp b/src/msgpack/type/vector.hpp index 4cd1597e..03b9d198 100644 --- a/src/msgpack/type/vector.hpp +++ b/src/msgpack/type/vector.hpp @@ -58,7 +58,7 @@ inline void operator<< (object::with_zone& o, const std::vector& v) { o.type = type::ARRAY; if(v.empty()) { - o.via.array.ptr = NULL; + o.via.array.ptr = nullptr; o.via.array.size = 0; } else { object* p = static_cast(o.zone->malloc(sizeof(object)*v.size())); diff --git a/src/msgpack/unpack.hpp b/src/msgpack/unpack.hpp index 107b2a15..b14b522f 100644 --- a/src/msgpack/unpack.hpp +++ b/src/msgpack/unpack.hpp @@ -110,7 +110,7 @@ struct unpack_array { o.type = type::ARRAY; o.via.array.size = 0; o.via.array.ptr = (object*)u.z().malloc(n*sizeof(object)); - if(o.via.array.ptr == NULL) { return false; } + if(o.via.array.ptr == nullptr) { return false; } return true; } }; @@ -123,7 +123,7 @@ struct unpack_map { o.type = type::MAP; o.via.map.size = 0; o.via.map.ptr = (object_kv*)u.z().malloc(n*sizeof(object_kv)); - if(o.via.map.ptr == NULL) { return false; } + if(o.via.map.ptr == nullptr) { return false; } return true; } }; @@ -802,9 +802,9 @@ private: inline void unpack(unpacked& result, - const char* data, size_t len, size_t* offset = NULL); + const char* data, size_t len, size_t* offset = nullptr); inline void unpack(unpacked* result, - const char* data, size_t len, size_t* offset = NULL); + const char* data, size_t len, size_t* offset = nullptr); // obsolete typedef enum { @@ -822,8 +822,8 @@ static unpack_return unpack(const char* data, size_t len, size_t* off, // obsolete -static object unpack(const char* data, size_t len, zone& z, size_t* off = NULL); -static object unpack(const char* data, size_t len, zone* z, size_t* off = NULL); +static object unpack(const char* data, size_t len, zone& z, size_t* off = nullptr); +static object unpack(const char* data, size_t len, zone* z, size_t* off = nullptr); inline unpacker::unpacker(size_t initial_buffer_size) @@ -1081,7 +1081,7 @@ unpack_imp(const char* data, size_t len, size_t* off, zone& result_zone, object& result) { size_t noff = 0; - if(off != NULL) { noff = *off; } + if(off != nullptr) { noff = *off; } if(len <= noff) { // FIXME @@ -1099,7 +1099,7 @@ unpack_imp(const char* data, size_t len, size_t* off, return UNPACK_PARSE_ERROR; } - if(off != NULL) { *off = noff; } + if(off != nullptr) { *off = noff; } if(e == 0) { return UNPACK_CONTINUE; diff --git a/src/msgpack/zbuffer.hpp b/src/msgpack/zbuffer.hpp index 10c0077e..117bc498 100644 --- a/src/msgpack/zbuffer.hpp +++ b/src/msgpack/zbuffer.hpp @@ -122,8 +122,8 @@ public: char* release_buffer() { char* tmp = data_; - data_ = NULL; - stream_.next_out = NULL; + data_ = nullptr; + stream_.next_out = nullptr; stream_.avail_out = 0; return tmp; } @@ -136,7 +136,7 @@ private: size_t nsize = (csize == 0) ? init_size_ : csize * 2; char* tmp = static_cast(::realloc(data_, nsize)); - if(tmp == NULL) { + if(tmp == nullptr) { return false; }