Moving to c++14

facontidavide · facontidavide · commit 75718160a45a · 2020-03-22T16:03:45.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,10 +7,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CONFIG_PATH}")
 
 #---- Enable C++11 ----
 if(NOT CMAKE_VERSION VERSION_LESS 3.1)
-    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 endif()
 
 if(MSVC)
diff --git a/include/behaviortree_cpp_v3/control_node.h b/include/behaviortree_cpp_v3/control_node.h
@@ -43,9 +43,11 @@ class ControlNode : public TreeNode
 
     virtual void halt() override;
 
-
     void haltChildren();
 
+    [[deprecated( "deprecated: please use explicitly haltChildren() or haltChild(i)")]]
+    void haltChildren(size_t first);
+
     void haltChild(size_t i);
 
     virtual NodeType type() const override final
diff --git a/src/control_node.cpp b/src/control_node.cpp
@@ -59,4 +59,12 @@ void ControlNode::haltChildren()
     }
 }
 
+void ControlNode::haltChildren(size_t first)
+{
+    for (size_t i = first; i < children_nodes_.size(); i++)
+    {
+        haltChild(i);
+    }
+}
+
 } // end namespace

Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,12 @@ void ControlNode::haltChildren()`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
	`62`	`+void ControlNode::haltChildren(size_t first)`
	`63`	`+{`
	`64`	`+ for (size_t i = first; i < children_nodes_.size(); i++)`
	`65`	`+ {`
	`66`	`+ haltChild(i);`
	`67`	`+ }`
	`68`	`+}`
	`69`	`+`
`62`	`70`	`} // end namespace`