From 31a3d34b491b3ee0e5b86804cc2a1d82d9245d73 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sat, 1 Nov 2014 16:32:20 +0900 Subject: [PATCH] Added warnings suppress option. Changed buffer type from char to unsigned char. --- CMakeLists.txt | 4 ++-- include/msgpack/pack_template.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f2f91d9..c7e1d47e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,9 +211,9 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST ENDIF () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + STRING(REGEX REPLACE "/W[0-4]" "/W4 /wd4127 /wd4310" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ELSE () - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4127 /wd4310") ENDIF () ENDIF () diff --git a/include/msgpack/pack_template.h b/include/msgpack/pack_template.h index fc47619f..c417cd34 100644 --- a/include/msgpack/pack_template.h +++ b/include/msgpack/pack_template.h @@ -811,50 +811,50 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type) { switch(l) { case 1: { - char buf[2]; + unsigned char buf[2]; buf[0] = 0xd4; buf[1] = type; msgpack_pack_append_buffer(x, buf, 2); } break; case 2: { - char buf[2]; + unsigned char buf[2]; buf[0] = 0xd5; buf[1] = type; msgpack_pack_append_buffer(x, buf, 2); } break; case 4: { - char buf[2]; + unsigned char buf[2]; buf[0] = 0xd6; buf[1] = type; msgpack_pack_append_buffer(x, buf, 2); } break; case 8: { - char buf[2]; + unsigned char buf[2]; buf[0] = 0xd7; buf[1] = type; msgpack_pack_append_buffer(x, buf, 2); } break; case 16: { - char buf[2]; + unsigned char buf[2]; buf[0] = 0xd8; buf[1] = type; msgpack_pack_append_buffer(x, buf, 2); } break; default: if(l < 256) { - char buf[3]; + unsigned char buf[3]; buf[0] = 0xc7; - buf[1] = l; + buf[1] = (unsigned char)l; buf[2] = type; msgpack_pack_append_buffer(x, buf, 3); } else if(l < 65536) { - char buf[4]; + unsigned char buf[4]; buf[0] = 0xc8; _msgpack_store16(&buf[1], l); buf[3] = type; msgpack_pack_append_buffer(x, buf, 4); } else { - char buf[6]; + unsigned char buf[6]; buf[0] = 0xc9; _msgpack_store32(&buf[1], l); buf[5] = type;