Skip to content

Commit b6dde61

Browse files
committed
compatibility adjust
1 parent b7abb94 commit b6dde61

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ export(PACKAGE ${PROJECT_NAME})
289289
######################################################
290290
# EXAMPLES and TOOLS
291291
if(BUILD_TOOLS)
292-
add_subdirectory(tools)
292+
add_subdirectory(bt_tools)
293293
endif()
294294

295295
if(BUILD_EXAMPLES AND BUILD_SAMPLES)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

include/behaviortree_cpp_v3/utils/make_unique.hpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@
1212
#include <utility>
1313

1414
namespace std {
15-
template<class T> struct _Unique_if {
16-
typedef unique_ptr<T> _Single_object;
17-
};
18-
19-
template<class T> struct _Unique_if<T[]> {
20-
typedef unique_ptr<T[]> _Unknown_bound;
21-
};
22-
23-
template<class T, size_t N> struct _Unique_if<T[N]> {
24-
typedef void _Known_bound;
25-
};
26-
27-
template<class T, class... Args>
28-
typename _Unique_if<T>::_Single_object
29-
make_unique(Args&&... args) {
30-
return unique_ptr<T>(new T(std::forward<Args>(args)...));
31-
}
32-
33-
template<class T>
34-
typename _Unique_if<T>::_Unknown_bound
35-
make_unique(size_t n) {
36-
typedef typename remove_extent<T>::type U;
37-
return unique_ptr<T>(new U[n]());
38-
}
39-
40-
template<class T, class... Args>
41-
typename _Unique_if<T>::_Known_bound
42-
make_unique(Args&&...) = delete;
15+
// template<class T> struct _Unique_if {
16+
// typedef unique_ptr<T> _Single_object;
17+
// };
18+
//
19+
// template<class T> struct _Unique_if<T[]> {
20+
// typedef unique_ptr<T[]> _Unknown_bound;
21+
// };
22+
//
23+
// template<class T, size_t N> struct _Unique_if<T[N]> {
24+
// typedef void _Known_bound;
25+
// };
26+
27+
// template<class T, class... Args>
28+
// typename _Unique_if<T>::_Single_object
29+
// make_unique(Args&&... args) {
30+
// return unique_ptr<T>(new T(std::forward<Args>(args)...));
31+
// }
32+
//
33+
// template<class T>
34+
// typename _Unique_if<T>::_Unknown_bound
35+
// make_unique(size_t n) {
36+
// typedef typename remove_extent<T>::type U;
37+
// return unique_ptr<T>(new U[n]());
38+
// }
39+
//
40+
// template<class T, class... Args>
41+
// typename _Unique_if<T>::_Known_bound
42+
// make_unique(Args&&...) = delete;
4343
}
4444

4545
#else

0 commit comments

Comments
 (0)