back to c++11

Davide Faconti · Davide Faconti · commit 38a6db7f3dd5 · 2019-03-20T10:45:25.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8.12) # version on Ubuntu Trusty
 project(behaviortree_cpp_v3)
 
 if(NOT CMAKE_VERSION VERSION_LESS 3.1)
-    set(CMAKE_CXX_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 11)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif()
 
 if(MSVC)
diff --git a/include/behaviortree_cpp/basic_types.h b/include/behaviortree_cpp/basic_types.h
@@ -9,10 +9,12 @@
 #include <typeinfo>
 #include <functional>
 #include <chrono>
+#include <memory>
 #include "behaviortree_cpp/utils/string_view.hpp"
 #include "behaviortree_cpp/utils/safe_any.hpp"
 #include "behaviortree_cpp/exceptions.h"
 #include "behaviortree_cpp/utils/expected.hpp"
+#include "behaviortree_cpp/utils/make_unique.hpp"
 
 namespace BT
 {
@@ -336,9 +338,6 @@ PortsList getProvidedPorts(enable_if_not< has_static_method_providedPorts<T> > =
 typedef std::chrono::high_resolution_clock::time_point TimePoint;
 typedef std::chrono::high_resolution_clock::duration Duration;
 
-
-
-
 } // end namespace
 
 
diff --git a/include/behaviortree_cpp/utils/make_unique.hpp b/include/behaviortree_cpp/utils/make_unique.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <memory>
+
+// https://en.cppreference.com/w/cpp/feature_test
+#if not __has_cpp_attribute(__cpp_lib_make_unique)
+
+//The compiler doesn't provide it, so implement it ourselves.
+
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+#include <utility>
+
+namespace std {
+
+template<class _Ty> struct _Unique_if {
+    typedef unique_ptr<_Ty> _Single_object;
+};
+
+template<class _Ty> struct _Unique_if<_Ty[]> {
+    typedef unique_ptr<_Ty[]> _Unknown_bound;
+};
+
+template<class _Ty, size_t N> struct _Unique_if<_Ty[N]> {
+    typedef void _Known_bound;
+};
+
+template<class _Ty, class... Args>
+typename _Unique_if<_Ty>::_Single_object
+make_unique(Args&&... args) {
+    return unique_ptr<_Ty>(new _Ty(std::forward<Args>(args)...));
+}
+
+template<class _Ty>
+typename _Unique_if<_Ty>::_Unknown_bound
+make_unique(size_t n) {
+    typedef typename remove_extent<_Ty>::type U;
+    return unique_ptr<_Ty>(new U[n]());
+}
+
+
+} // namespace std
+
+#endif // !COMPILER_SUPPORTS_MAKE_UNIQUE
+
