summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-09-25 17:45:11 +0200
committerworktycho <work.tycho@gmail.com>2015-09-25 17:45:11 +0200
commit335374376bff16459eb3e3585a93f931e1b3c306 (patch)
tree3b6665c38ce5881b0d8345ee7bc495a5b97a0457 /src/main.cpp
parentMerge pull request #2491 from cuberite/FixLilypadPopout (diff)
parentMaked it compileable for clang-3.7 (diff)
downloadcuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.gz
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.bz2
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.lz
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.xz
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.tar.zst
cuberite-335374376bff16459eb3e3585a93f931e1b3c306.zip
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 6e7dc0aff..c26e7900f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -522,7 +522,7 @@ int main(int argc, char **argv)
while (!cRoot::m_TerminateEventRaised)
{
- UniversalMain(std::move(ParseArguments(argc, argv)));
+ UniversalMain(ParseArguments(argc, argv));
}
#endif
}
@@ -531,7 +531,7 @@ int main(int argc, char **argv)
while (!cRoot::m_TerminateEventRaised)
{
// Not running as a service, do normal startup
- UniversalMain(std::move(ParseArguments(argc, argv)));
+ UniversalMain(ParseArguments(argc, argv));
}
}