summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-05-19 12:55:23 +0200
committertycho <work.tycho@gmail.com>2015-05-19 12:55:23 +0200
commit95e06ab93ff98c7bcffcf8a68a479802c8a56fe3 (patch)
tree87e8224964c12b746e34701dfffbcd3201889cdf /src/Globals.h
parentFixed a lot of warnings (diff)
parentMerge pull request #2019 from mc-server/OverrideArgs (diff)
downloadcuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar.gz
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar.bz2
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar.lz
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar.xz
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.tar.zst
cuberite-95e06ab93ff98c7bcffcf8a68a479802c8a56fe3.zip
Diffstat (limited to 'src/Globals.h')
-rw-r--r--src/Globals.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Globals.h b/src/Globals.h
index 1f354ae77..27d944fcc 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -433,10 +433,14 @@ typename std::enable_if<std::is_arithmetic<T>::value, C>::type CeilC(T a_Value)
//temporary replacement for std::make_unique until we get c++14
-template <class T, class... Args>
-std::unique_ptr<T> make_unique(Args&&... args)
+
+namespace cpp14
{
- return std::unique_ptr<T>(new T(args...));
+ template <class T, class... Args>
+ std::unique_ptr<T> make_unique(Args&&... args)
+ {
+ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+ }
}
// a tick is 50 ms