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

Fix Android STLPort build.

Browse Source 
Change-Id: Iceca7b8b455c8463d9b82b928332a875dee3d19e
This commit is contained in:
Wouter van Oortmerssen
2017-04-21 10:49:07 -07:00
parent 808b44f87a
commit f52ddfbd68
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/flatbuffers/util.h
View File

@@ -42,6 +42,7 @@
#include "flatbuffers/flatbuffers.h" #include "flatbuffers/flatbuffers.h"
namespace flatbuffers { namespace flatbuffers {
// Convert an integer or floating point value to a string. // Convert an integer or floating point value to a string.
@@ -114,11 +115,6 @@ inline uint64_t StringToUInt(const char *str, char **endptr = nullptr,
#endif #endif
} }
// Pedantic warning free version of toupper().
inline char ToUpper(char c) {
return static_cast<char>(::toupper(c));
}
typedef bool (*LoadFileFunction)(const char *filename, bool binary, typedef bool (*LoadFileFunction)(const char *filename, bool binary,
std::string *dest); std::string *dest);
typedef bool (*FileExistsFunction)(const char *filename); typedef bool (*FileExistsFunction)(const char *filename);

5
src/idl_gen_cpp.cpp
View File

@@ -23,6 +23,11 @@
namespace flatbuffers { namespace flatbuffers {
// Pedantic warning free version of toupper().
inline char ToUpper(char c) {
return static_cast<char>(::toupper(c));
}
static std::string GeneratedFileName(const std::string &path, static std::string GeneratedFileName(const std::string &path,
const std::string &file_name) { const std::string &file_name) {
return path + file_name + "_generated.h"; return path + file_name + "_generated.h";