diff --git a/doc/generated/easings.cpp b/doc/generated/easings.cpp index 6e925cb6d..90ad058e4 100644 --- a/doc/generated/easings.cpp +++ b/doc/generated/easings.cpp @@ -204,7 +204,7 @@ const Color3 success = 0x3bd267_srgbf; int main() { using namespace Animation::Easing; - #define _c(name) Utility::String::lowercase(#name), name + #define _c(name) Utility::String::lowercase(std::string{#name}), name generate(_c(linear), {}, /* [linear] */ CubicBezier2D{Vector2{0.0f}, Vector2{1.0f/3.0f}, diff --git a/src/Magnum/GL/Context.cpp b/src/Magnum/GL/Context.cpp index 2fbc7d6b2..fdeafb5b8 100644 --- a/src/Magnum/GL/Context.cpp +++ b/src/Magnum/GL/Context.cpp @@ -719,7 +719,7 @@ Context::Context(NoCreateT, Utility::Arguments& args, Int argc, const char** arg bother with String allocations. */ const Containers::StringView disabledWorkarounds = args.value("disable-workarounds"); if(!disabledWorkarounds.isEmpty()) { - const Containers::Array split = disabledWorkarounds.splitWithoutEmptyParts(); + const Containers::Array split = disabledWorkarounds.splitOnWhitespaceWithoutEmptyParts(); arrayReserve(_driverWorkarounds, split.size()); for(const Containers::StringView workaround: split) disableDriverWorkaround(workaround); @@ -730,7 +730,7 @@ Context::Context(NoCreateT, Utility::Arguments& args, Int argc, const char** arg and another binary search in tryCreate(). */ const Containers::StringView disabledExtensions = args.value("disable-extensions"); if(!disabledExtensions.isEmpty()) { - const Containers::Array split = disabledExtensions.splitWithoutEmptyParts(); + const Containers::Array split = disabledExtensions.splitOnWhitespaceWithoutEmptyParts(); arrayReserve(_disabledExtensions, split.size()); for(const Containers::StringView extension: split) { if(const Extension* found = findExtension(extension)) { @@ -1074,7 +1074,7 @@ Containers::Array Context::extensionStrings() const { #ifndef MAGNUM_TARGET_GLES3 /* OpenGL 2.1 / OpenGL ES 2.0 doesn't have glGetStringi() */ - return Containers::StringView{reinterpret_cast(glGetString(GL_EXTENSIONS)), Containers::StringViewFlag::Global}.splitWithoutEmptyParts(); + return Containers::StringView{reinterpret_cast(glGetString(GL_EXTENSIONS)), Containers::StringViewFlag::Global}.splitOnWhitespaceWithoutEmptyParts(); #endif } diff --git a/src/Magnum/Vk/Device.cpp b/src/Magnum/Vk/Device.cpp index 245982a93..5c4357e4a 100644 --- a/src/Magnum/Vk/Device.cpp +++ b/src/Magnum/Vk/Device.cpp @@ -141,7 +141,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext we don't need to bother with String allocations. */ Containers::StringView disabledWorkarounds = args.value("disable-workarounds"); if(!disabledWorkarounds.isEmpty()) { - const Containers::Array split = disabledWorkarounds.splitWithoutEmptyParts(); + const Containers::Array split = disabledWorkarounds.splitOnWhitespaceWithoutEmptyParts(); arrayReserve(_state->encounteredWorkarounds, split.size()); for(const Containers::StringView workaround: split) Implementation::disableWorkaround(_state->encounteredWorkarounds, workaround); @@ -152,7 +152,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext Containers::String disabledExtensions = args.value("disable-extensions"); if(!disabledExtensions.isEmpty()) { _state->disabledExtensionsStorage = std::move(disabledExtensions); - _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitWithoutEmptyParts(); + _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitOnWhitespaceWithoutEmptyParts(); std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end()); } @@ -164,7 +164,7 @@ DeviceCreateInfo::DeviceCreateInfo(DeviceProperties& deviceProperties, const Ext allocation-free, the strings will be turned into owning copies because none of them is null-terminated or global -- could be a better idea to just grow one giant string internally (once we have growable strings) */ - addEnabledExtensions(args.value("enable-extensions").splitWithoutEmptyParts()); + addEnabledExtensions(args.value("enable-extensions").splitOnWhitespaceWithoutEmptyParts()); /* Enable implicit extensions unless that's forbidden */ /** @todo move this somewhere else as this will grow significantly? */ diff --git a/src/Magnum/Vk/Instance.cpp b/src/Magnum/Vk/Instance.cpp index d89ad4a36..b1202d39e 100644 --- a/src/Magnum/Vk/Instance.cpp +++ b/src/Magnum/Vk/Instance.cpp @@ -104,14 +104,14 @@ InstanceCreateInfo::InstanceCreateInfo(const Int argc, const char** const argv, if(!_state) _state.emplace(); _state->disabledLayersStorage = std::move(disabledLayers); - _state->disabledLayers = Containers::StringView{_state->disabledLayersStorage}.splitWithoutEmptyParts(); + _state->disabledLayers = Containers::StringView{_state->disabledLayersStorage}.splitOnWhitespaceWithoutEmptyParts(); std::sort(_state->disabledLayers.begin(), _state->disabledLayers.end()); } if(!disabledExtensions.isEmpty()) { if(!_state) _state.emplace(); _state->disabledExtensionsStorage = std::move(disabledExtensions); - _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitWithoutEmptyParts(); + _state->disabledExtensions = Containers::StringView{_state->disabledExtensionsStorage}.splitOnWhitespaceWithoutEmptyParts(); std::sort(_state->disabledExtensions.begin(), _state->disabledExtensions.end()); } @@ -123,8 +123,8 @@ InstanceCreateInfo::InstanceCreateInfo(const Int argc, const char** const argv, allocation-free, the strings will be turned into owning copies because none of them is null-terminated or global -- could be a better idea to just grow one giant string internally (once we have growable strings) */ - addEnabledLayers(args.value("enable-layers").splitWithoutEmptyParts()); - addEnabledExtensions(args.value("enable-instance-extensions").splitWithoutEmptyParts()); + addEnabledLayers(args.value("enable-layers").splitOnWhitespaceWithoutEmptyParts()); + addEnabledExtensions(args.value("enable-instance-extensions").splitOnWhitespaceWithoutEmptyParts()); /** @todo use this (enabling debug layers etc.) */ static_cast(layerProperties);