commit b2e55c556eca7d56ff112ffc7f6b42b6ea5c22c5
author Jason Sanmiya <jsanmiya@google.com> Thu Sep 15 18:42:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 15 18:42:42 2016 +0000
tree 6e2fc2d7b997156a577e968ea9273793f5978a4f
parent 3368407affe57bdaf11d9e89fb1087c4e15d3457
parent 985de211af3a46a261a05ca8a784141c44b33bd0

Merge "Fix Windows warnings." into ub-games-master

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad01c21..bee9322 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@
   set(CMAKE_CXX_FLAGS
     "${CMAKE_CXX_FLAGS} -fsigned-char")
 
-elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
   set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++ -Wall -pedantic -Werror \
                           -Wextra")

src/idl_gen_text.cpp

diff --git a/src/idl_gen_text.cpp b/src/idl_gen_text.cpp
index 4ff13c8..17cd987 100644
--- a/src/idl_gen_text.cpp
+++ b/src/idl_gen_text.cpp
@@ -148,12 +148,12 @@
             } else if (ucc <= 0x10FFFF) {
               // Encode Unicode SMP values to a surrogate pair using two \u escapes.
               uint32_t base = ucc - 0x10000;
-              uint16_t highSurrogate = (base >> 10) + 0xD800;
-              uint16_t lowSurrogate = (base & 0x03FF) + 0xDC00;
+              auto high_surrogate = (base >> 10) + 0xD800;
+              auto low_surrogate = (base & 0x03FF) + 0xDC00;
               text += "\\u";
-              text += IntToStringHex(highSurrogate, 4);
+              text += IntToStringHex(high_surrogate, 4);
               text += "\\u";
-              text += IntToStringHex(lowSurrogate, 4);
+              text += IntToStringHex(low_surrogate, 4);
             }
             // Skip past characters recognized.
             i = static_cast<uoffset_t>(utf8 - s.c_str() - 1);