FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'OpenSceneGraph-3.6' into build/windows_clang_3.6_target

Browse Source
This commit is contained in:
Robert Osfield
2020-11-10 14:41:56 +00:00
committed by GitHub
parent ba70c7d543 b8982224c3
commit 7994bfa767
97 changed files with 199 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgDB/FileUtils.cpp
View File

@@ -277,14 +277,14 @@ void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathL
#if defined(_WIN32) && !defined(__CYGWIN__)
char delimitor = ';';
#else
char delimitor = ':';
char delimiter = ':';
#endif
if (!paths.empty())
{
std::string::size_type start = 0;
std::string::size_type end;
while ((end = paths.find_first_of(delimitor,start))!=std::string::npos)
while ((end = paths.find_first_of(delimiter,start))!=std::string::npos)
{
filepath.push_back(std::string(paths,start,end-start));
start = end+1;
@@ -988,7 +988,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths)
// The Carbon version is noticeably longer.
// Unfortunately, the Cocoa version requires -lobjc to be
// linked in when creating an executable.
// Rumor is that this will be done autmatically in gcc 3.5/Tiger,
// Rumor is that this will be done automatically in gcc 3.5/Tiger,
// but for now, this will cause a lot of headaches for people
// who aren't familiar with this concept, so the Carbon version
// is preferable.