Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP

facontidavide · facontidavide · commit cb65991fbfe8 · 2020-03-19T14:08:18.000+01:00
diff --git a/include/behaviortree_cpp_v3/tree_node.h b/include/behaviortree_cpp_v3/tree_node.h
@@ -153,7 +153,7 @@ class TreeNode
     friend class BehaviorTreeFactory;
     friend class DecoratorNode;
     friend class ControlNode;
-    friend class Tree;
+    friend struct Tree;
 
     // Only BehaviorTreeFactory should call this
     void setRegistrationID(StringView ID)
diff --git a/include/behaviortree_cpp_v3/utils/make_unique.hpp b/include/behaviortree_cpp_v3/utils/make_unique.hpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#if defined(_MSC_VER) && __cplusplus == 201103L
+#if defined(_MSC_VER) && _MSC_VER >= 1900 // MSVC 2015 or newer.
 #  define MAKE_UNIQUE_DEFINED 1
 #endif
 
diff --git a/include/behaviortree_cpp_v3/utils/string_view.hpp b/include/behaviortree_cpp_v3/utils/string_view.hpp
@@ -891,6 +891,14 @@ nssv_constexpr bool operator== (
     basic_string_view <CharT, Traits> rhs ) nssv_noexcept
 { return lhs.compare( rhs ) == 0 ; }
 
+template< class CharT, class Traits >
+nssv_constexpr bool operator== (
+    basic_string_view <CharT, Traits> lhs,
+    CharT const * rhs) nssv_noexcept
+{
+    return lhs.compare(rhs) == 0;
+}
+
 template< class CharT, class Traits >
 nssv_constexpr bool operator!= (
     basic_string_view <CharT, Traits> lhs,
