diff --git a/ext/ghoul b/ext/ghoul index 42c4d7e985..611f96b403 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 42c4d7e9855516510249fa6520e5d62beb679115 +Subproject commit 611f96b403ced4472f049885461260026b0554a3 diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 374c6c93f9..d7b3e61348 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -46,7 +46,6 @@ namespace { constexpr const char* KeyFilename = "Filename"; constexpr const char* TempSuffix = ".tmp"; - constexpr const char* FileSuffix = ".txt"; } // namespace namespace openspace { @@ -128,10 +127,6 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict, if (dict.hasValue(KeyFilename)) { _filename = dict.value(KeyFilename); - std::size_t foundExt = _filename.find(FileSuffix); - if (foundExt == std::string::npos) { - _filename += FileSuffix; - } } bool useHash = true; @@ -204,12 +199,10 @@ void UrlSynchronization::start() { std::string lastPartOfUrl = url.substr(lastSlash + 1); // We can not create filenames with questionmarks - lastPartOfUrl.erase(std::remove(lastPartOfUrl.begin(), lastPartOfUrl.end(), '?'), lastPartOfUrl.end()); - - std::size_t foundExt = lastPartOfUrl.find(FileSuffix); - if (foundExt == std::string::npos) { - lastPartOfUrl += FileSuffix; - } + lastPartOfUrl.erase( + std::remove(lastPartOfUrl.begin(), lastPartOfUrl.end(), '?'), + lastPartOfUrl.end() + ); _filename = lastPartOfUrl; } std::string fileDestination = directory() + diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl index ee8b2d6258..1e00beee8c 100644 --- a/src/scene/scene_lua.inl +++ b/src/scene/scene_lua.inl @@ -29,7 +29,6 @@ #include #include -#pragma optimize ("", off) namespace openspace { namespace {