diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:49:42 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-20 09:49:42 +1100 |
commit | aa987a217779e71f97ee4c9cce531aec1c861bf8 (patch) | |
tree | e51fcce110306d93bf93870f13a5ff7d6b575427 /source/game/StarRootLoader.cpp | |
parent | d0099a6d790b66f21e4e266e569d64fb82fb0a81 (diff) | |
parent | 1c89042016c739815b2d70bcbef4673eef6b63e0 (diff) |
Merge branch 'main' into small-fixes
Diffstat (limited to 'source/game/StarRootLoader.cpp')
-rw-r--r-- | source/game/StarRootLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/game/StarRootLoader.cpp b/source/game/StarRootLoader.cpp index 9ede365..f6843f3 100644 --- a/source/game/StarRootLoader.cpp +++ b/source/game/StarRootLoader.cpp @@ -106,7 +106,7 @@ RootLoader::RootLoader(Defaults defaults) { addSwitch("runtimeconfig", strf("Sets the path to the runtime configuration storage file relative to root directory, defauts to {}", defaults.runtimeConfigFile ? *defaults.runtimeConfigFile : "no storage file")); - m_defaults = move(defaults); + m_defaults = std::move(defaults); } pair<Root::Settings, RootLoader::Options> RootLoader::parseOrDie( @@ -118,7 +118,7 @@ pair<Root::Settings, RootLoader::Options> RootLoader::parseOrDie( pair<RootUPtr, RootLoader::Options> RootLoader::initOrDie(StringList const& cmdLineArguments) const { auto p = parseOrDie(cmdLineArguments); auto root = make_unique<Root>(p.first); - return {move(root), p.second}; + return {std::move(root), p.second}; } pair<Root::Settings, RootLoader::Options> RootLoader::commandParseOrDie(int argc, char** argv) { @@ -129,7 +129,7 @@ pair<Root::Settings, RootLoader::Options> RootLoader::commandParseOrDie(int argc pair<RootUPtr, RootLoader::Options> RootLoader::commandInitOrDie(int argc, char** argv) { auto p = commandParseOrDie(argc, argv); auto root = make_unique<Root>(p.first); - return {move(root), p.second}; + return {std::move(root), p.second}; } Root::Settings RootLoader::rootSettingsForOptions(Options const& options) const { |