From 2fcbe6116d45b80a23486929f956a4765fae85ef Mon Sep 17 00:00:00 2001 From: Nobuyuki Kubota Date: Mon, 6 Oct 2014 14:06:21 -0700 Subject: [PATCH] Replace C-style casts with C++-style ones --- src/msgpack/object.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msgpack/object.hpp b/src/msgpack/object.hpp index a8a4eddd..8c160eaf 100644 --- a/src/msgpack/object.hpp +++ b/src/msgpack/object.hpp @@ -249,13 +249,13 @@ inline void operator<< (object::with_zone& o, const object& v) return; case type::RAW: - o.via.raw.ptr = (const char*)o.zone->malloc(v.via.raw.size); + o.via.raw.ptr = static_cast(o.zone->malloc(v.via.raw.size)); o.via.raw.size = v.via.raw.size; - ::memcpy((void*)o.via.raw.ptr, v.via.raw.ptr, v.via.raw.size); + ::memcpy(const_cast(o.via.raw.ptr), v.via.raw.ptr, v.via.raw.size); return; case type::ARRAY: - o.via.array.ptr = (object*)o.zone->malloc(sizeof(object) * v.via.array.size); + o.via.array.ptr = static_cast(o.zone->malloc(sizeof(object) * v.via.array.size)); o.via.array.size = v.via.array.size; for(object* po(o.via.array.ptr), * pv(v.via.array.ptr), * const pvend(v.via.array.ptr + v.via.array.size); @@ -265,7 +265,7 @@ inline void operator<< (object::with_zone& o, const object& v) return; case type::MAP: - o.via.map.ptr = (object_kv*)o.zone->malloc(sizeof(object_kv) * v.via.map.size); + o.via.map.ptr = static_cast(o.zone->malloc(sizeof(object_kv) * v.via.map.size)); o.via.map.size = v.via.map.size; for(object_kv* po(o.via.map.ptr), * pv(v.via.map.ptr), * const pvend(v.via.map.ptr + v.via.map.size);