From 6d4f8084344871801babdacb22645442b2354734 Mon Sep 17 00:00:00 2001 From: Hannes Pabst Date: Tue, 17 Nov 2020 08:13:57 +0100 Subject: [PATCH] fix variable name "delimiter"/compilation for win32 --- src/osg/DisplaySettings.cpp | 4 ++-- src/osgDB/FileUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index 99b12ac45..43156bd26 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -734,7 +734,7 @@ void DisplaySettings::readEnvironmentalVariables() if (getEnvVar("OSG_KEYSTONE_FILES", value)) { #if defined(_WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else char delimiter = ':'; #endif @@ -798,7 +798,7 @@ void DisplaySettings::readEnvironmentalVariables() if (getEnvVar("OSG_SHADER_PIPELINE_FILES", value)) { #if defined(_WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else char delimiter = ':'; #endif diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index 2328e5f87..3c61dae62 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -275,7 +275,7 @@ bool osgDB::setCurrentWorkingDirectory( const std::string &newCurrentWorkingDire void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath) { #if defined(_WIN32) && !defined(__CYGWIN__) - char delimitor = ';'; + char delimiter = ';'; #else char delimiter = ':'; #endif