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

Fix error in ConCatPathFileName (#4575)

Browse Source
This commit is contained in:
Bastien Brunnenstein
2018-01-04 18:09:09 +01:00
committed by Wouter van Oortmerssen
parent 99a8a68a80
commit 9dae3eac60
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/stl_emulation.h
View File

@@ -38,6 +38,10 @@ namespace flatbuffers {
// Retrieve ::back() from a string in a way that is compatible with pre C++11 // Retrieve ::back() from a string in a way that is compatible with pre C++11
// STLs (e.g stlport). // STLs (e.g stlport).
inline char& string_back(std::string &value) {
return value[value.length() - 1];
}
inline char string_back(const std::string &value) { inline char string_back(const std::string &value) {
return value[value.length() - 1]; return value[value.length() - 1];
} }

2
include/flatbuffers/util.h
View File

@@ -216,7 +216,7 @@ inline std::string ConCatPathFileName(const std::string &path,
const std::string &filename) { const std::string &filename) {
std::string filepath = path; std::string filepath = path;
if (filepath.length()) { if (filepath.length()) {
char filepath_last_character = string_back(filepath); char &filepath_last_character = string_back(filepath);
if (filepath_last_character == kPathSeparatorWindows) { if (filepath_last_character == kPathSeparatorWindows) {
filepath_last_character = kPathSeparator; filepath_last_character = kPathSeparator;
} else if (filepath_last_character != kPathSeparator) { } else if (filepath_last_character != kPathSeparator) {