generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-24 06:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #157 from redboltz/fix_vc2008_warnings

Browse Source 
Added warnings suppress option.
This commit is contained in:
Takatoshi Kondo 2014-11-01 17:04:51 +09:00
commit a0ae0289dc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -211,9 +211,9 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST
ENDIF () ENDIF ()
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") 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 () ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4127 /wd4310")
ENDIF () ENDIF ()
ENDIF () ENDIF ()

18
include/msgpack/pack_template.h
View File

@ -811,50 +811,50 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
{ {
switch(l) { switch(l) {
case 1: { case 1: {
char buf[2]; unsigned char buf[2];
buf[0] = 0xd4; buf[0] = 0xd4;
buf[1] = type; buf[1] = type;
msgpack_pack_append_buffer(x, buf, 2); msgpack_pack_append_buffer(x, buf, 2);
} break; } break;
case 2: { case 2: {
char buf[2]; unsigned char buf[2];
buf[0] = 0xd5; buf[0] = 0xd5;
buf[1] = type; buf[1] = type;
msgpack_pack_append_buffer(x, buf, 2); msgpack_pack_append_buffer(x, buf, 2);
} break; } break;
case 4: { case 4: {
char buf[2]; unsigned char buf[2];
buf[0] = 0xd6; buf[0] = 0xd6;
buf[1] = type; buf[1] = type;
msgpack_pack_append_buffer(x, buf, 2); msgpack_pack_append_buffer(x, buf, 2);
} break; } break;
case 8: { case 8: {
char buf[2]; unsigned char buf[2];
buf[0] = 0xd7; buf[0] = 0xd7;
buf[1] = type; buf[1] = type;
msgpack_pack_append_buffer(x, buf, 2); msgpack_pack_append_buffer(x, buf, 2);
} break; } break;
case 16: { case 16: {
char buf[2]; unsigned char buf[2];
buf[0] = 0xd8; buf[0] = 0xd8;
buf[1] = type; buf[1] = type;
msgpack_pack_append_buffer(x, buf, 2); msgpack_pack_append_buffer(x, buf, 2);
} break; } break;
default: default:
if(l < 256) { if(l < 256) {
char buf[3]; unsigned char buf[3];
buf[0] = 0xc7; buf[0] = 0xc7;
buf[1] = l; buf[1] = (unsigned char)l;
buf[2] = type; buf[2] = type;
msgpack_pack_append_buffer(x, buf, 3); msgpack_pack_append_buffer(x, buf, 3);
} else if(l < 65536) { } else if(l < 65536) {
char buf[4]; unsigned char buf[4];
buf[0] = 0xc8; buf[0] = 0xc8;
_msgpack_store16(&buf[1], l); _msgpack_store16(&buf[1], l);
buf[3] = type; buf[3] = type;
msgpack_pack_append_buffer(x, buf, 4); msgpack_pack_append_buffer(x, buf, 4);
} else { } else {
char buf[6]; unsigned char buf[6];
buf[0] = 0xc9; buf[0] = 0xc9;
_msgpack_store32(&buf[1], l); _msgpack_store32(&buf[1], l);
buf[5] = type; buf[5] = type;