BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-25 00:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows warnings.

Browse Source 
Cmake issued a warning when the variable is in quotation marks
in an if statement.

Visual Studio upgrades constants to int and issues a truncation
warning, so inserted a cast.

Change-Id: I60cdcb5c2565cd5e97f80b9c2ff1e6abc32b1deb
Tested: Builds without warning on VS2015.
This commit is contained in:
Jason Sanmiya
2016-09-08 10:47:50 -07:00
parent 8e3fa336eb
commit 985de211af
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -119,7 +119,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -fsigned-char") "${CMAKE_CXX_FLAGS} -fsigned-char")
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror \ "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror \
-Wextra") -Wextra")

8
src/idl_gen_text.cpp
View File

@@ -148,12 +148,12 @@ static bool EscapeString(const String &s, std::string *_text, const IDLOptions&
} else if (ucc <= 0x10FFFF) { } else if (ucc <= 0x10FFFF) {
// Encode Unicode SMP values to a surrogate pair using two \u escapes. // Encode Unicode SMP values to a surrogate pair using two \u escapes.
uint32_t base = ucc - 0x10000; uint32_t base = ucc - 0x10000;
uint16_t highSurrogate = (base >> 10) + 0xD800; auto high_surrogate = (base >> 10) + 0xD800;
uint16_t lowSurrogate = (base & 0x03FF) + 0xDC00; auto low_surrogate = (base & 0x03FF) + 0xDC00;
text += "\\u"; text += "\\u";
text += IntToStringHex(highSurrogate, 4); text += IntToStringHex(high_surrogate, 4);
text += "\\u"; text += "\\u";
text += IntToStringHex(lowSurrogate, 4); text += IntToStringHex(low_surrogate, 4);
} }
// Skip past characters recognized. // Skip past characters recognized.
i = static_cast<uoffset_t>(utf8 - s.c_str() - 1); i = static_cast<uoffset_t>(utf8 - s.c_str() - 1);