Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows test cases (#1537)

Browse Source
This commit is contained in:
Ben Doherty
2019-08-20 15:36:22 -07:00
committed by GitHub
parent f8aa17c245
commit bd22bed2fb
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/utils/src/Path.cpp
View File

@@ -70,7 +70,8 @@ bool Path::isDirectory() const {
Path Path::concat(const Path& path) const {
if (path.isEmpty()) return *this;
if (path.isAbsolute()) return path;
if (m_path.back() != SEPARATOR && !m_path.empty()) {
// std::string::back() is UB if the string is empty, so we rely on short-circuit evaluation
if (!m_path.empty() && m_path.back() != SEPARATOR) {
return Path(m_path + SEPARATOR + path.getPath());
}
return Path(m_path + path.getPath());
@@ -80,7 +81,8 @@ void Path::concatToSelf(const Path& path) {
if (!path.isEmpty()) {
if (path.isAbsolute()) {
m_path = path.getPath();
} else if (m_path.back() != SEPARATOR) {
// std::string::back() is UB if the string is empty, so we rely on short-circuit evaluation
} else if (!m_path.empty() && m_path.back() != SEPARATOR) {
m_path = getCanonicalPath(m_path + SEPARATOR + path.getPath());
} else {
m_path = getCanonicalPath(m_path + path.getPath());