From 5db12e9907e52bdbee9af5725df166eeda184a06 Mon Sep 17 00:00:00 2001 From: Jason Sanmiya Date: Fri, 11 Sep 2015 13:40:59 -0700 Subject: [PATCH] Fix Visual Studio 2012 build warning. Also, remove execute permissions on several source files. Tested: Builds on Visual Studio 2012, and Linux. Change-Id: Idaacb2ae8eba98ce2974218c2ab840e97a1d67e9 --- LICENSE.txt | 0 android/jni/main.cpp | 0 include/flatbuffers/util.h | 2 +- samples/sample_binary.cpp | 0 samples/sample_text.cpp | 0 src/flatc.cpp | 0 6 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 LICENSE.txt mode change 100755 => 100644 android/jni/main.cpp mode change 100755 => 100644 samples/sample_binary.cpp mode change 100755 => 100644 samples/sample_text.cpp mode change 100755 => 100644 src/flatc.cpp diff --git a/LICENSE.txt b/LICENSE.txt old mode 100755 new mode 100644 diff --git a/android/jni/main.cpp b/android/jni/main.cpp old mode 100755 new mode 100644 diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h index 3951bbdd7..d34850b16 100644 --- a/include/flatbuffers/util.h +++ b/include/flatbuffers/util.h @@ -112,7 +112,7 @@ inline bool LoadFile(const char *name, bool binary, std::string *buf) { std::ifstream ifs(name, binary ? std::ifstream::binary : std::ifstream::in); if (!ifs.is_open()) return false; ifs.seekg(0, std::ios::end); - (*buf).resize(ifs.tellg()); + (*buf).resize(static_cast(ifs.tellg())); ifs.seekg(0, std::ios::beg); ifs.read(&(*buf)[0], (*buf).size()); return !ifs.bad(); diff --git a/samples/sample_binary.cpp b/samples/sample_binary.cpp old mode 100755 new mode 100644 diff --git a/samples/sample_text.cpp b/samples/sample_text.cpp old mode 100755 new mode 100644 diff --git a/src/flatc.cpp b/src/flatc.cpp old mode 100755 new mode 100644