Merge pull request BehaviorTree#139 from scgroot/master

facontidavide · web-flow · commit 0ab389505dea · 2020-01-02T13:38:34.000+01:00
Fixed compiling for c++17
diff --git a/include/behaviortree_cpp_v3/basic_types.h b/include/behaviortree_cpp_v3/basic_types.h
@@ -256,10 +256,10 @@ std::pair<std::string,PortInfo> CreatePort(PortDirection direction,
 
     if( std::is_same<T, void>::value)
     {
-        out = {name.to_string(), PortInfo(direction) };
+        out = {nonstd::to_string(name), PortInfo(direction) };
     }
     else{
-        out =  {name.to_string(), PortInfo(direction, typeid(T),
+        out =  {nonstd::to_string(name), PortInfo(direction, typeid(T),
                                           GetAnyFromStringFunctor<T>() ) };
     }
     if( !description.empty() )
diff --git a/include/behaviortree_cpp_v3/exceptions.h b/include/behaviortree_cpp_v3/exceptions.h
@@ -24,7 +24,7 @@ class BehaviorTreeException : public std::exception
 {
   public:
 
-    BehaviorTreeException(nonstd::string_view message):  message_(message.to_string())
+    BehaviorTreeException(nonstd::string_view message):  message_(nonstd::to_string(message))
     {}
 
     template <typename... SV>
diff --git a/include/behaviortree_cpp_v3/tree_node.h b/include/behaviortree_cpp_v3/tree_node.h
@@ -208,7 +208,7 @@ inline Result TreeNode::getInput(const std::string& key, T& destination) const
                                            "but BB is invalid");
         }
 
-        const Any* val = config_.blackboard->getAny(remapped_key.to_string());
+        const Any* val = config_.blackboard->getAny(nonstd::to_string(remapped_key));
         if (val && val->empty() == false)
         {
             if (std::is_same<T, std::string>::value == false && val->type() == typeid(std::string))
@@ -258,7 +258,7 @@ inline Result TreeNode::setOutput(const std::string& key, const T& value)
     {
         remapped_key = stripBlackboardPointer(remapped_key);
     }
-    const auto& key_str = remapped_key.to_string();
+    const auto& key_str = nonstd::to_string(remapped_key);
 
     config_.blackboard->set(key_str, value);
 
diff --git a/src/basic_types.cpp b/src/basic_types.cpp
@@ -103,7 +103,7 @@ std::string convertFromString<std::string>(StringView str)
 template <>
 const char* convertFromString<const char*>(StringView str)
 {
-    return str.to_string().c_str();
+    return nonstd::to_string(str).c_str();
 }
 
 template <>
@@ -197,7 +197,7 @@ NodeStatus convertFromString<NodeStatus>(StringView str)
     if( str == "RUNNING" ) return NodeStatus::RUNNING;
     if( str == "SUCCESS" ) return NodeStatus::SUCCESS;
     if( str == "FAILURE" ) return NodeStatus::FAILURE;
-    throw RuntimeError(std::string("Cannot convert this to NodeStatus: ") + str.to_string() );
+    throw RuntimeError(std::string("Cannot convert this to NodeStatus: ") + nonstd::to_string(str) );
 }
 
 template <>
@@ -288,12 +288,12 @@ Any PortInfo::parseString(const std::string &str) const
 
 void PortInfo::setDescription(StringView description)
 {
-    description_ = description.to_string();
+    description_ = nonstd::to_string(description);
 }
 
 void PortInfo::setDefaultValue(StringView default_value_as_string)
 {
-    default_value_ = default_value_as_string.to_string();
+    default_value_ = nonstd::to_string(default_value_as_string);
 }
 
 const std::string &PortInfo::description() const
diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
@@ -520,7 +520,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,
             auto remapped_res = TreeNode::getRemappedKey(port_name, remapping_value);
             if( remapped_res )
             {
-                const auto& port_key = remapped_res.value().to_string();
+                const auto& port_key = nonstd::to_string(remapped_res.value());
 
                 auto prev_info = blackboard->portInfo( port_key );
                 if( !prev_info  )

Original file line number	Diff line number	Diff line change
`@@ -256,10 +256,10 @@ std::pair<std::string,PortInfo> CreatePort(PortDirection direction,`
`256`	`256`
`257`	`257`	`if( std::is_same<T, void>::value)`
`258`	`258`	`{`
`259`		`- out = {name.to_string(), PortInfo(direction) };`
	`259`	`+ out = {nonstd::to_string(name), PortInfo(direction) };`
`260`	`260`	`}`
`261`	`261`	`else{`
`262`		`- out = {name.to_string(), PortInfo(direction, typeid(T),`
	`262`	`+ out = {nonstd::to_string(name), PortInfo(direction, typeid(T),`
`263`	`263`	`GetAnyFromStringFunctor<T>() ) };`
`264`	`264`	`}`
`265`	`265`	`if( !description.empty() )`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class BehaviorTreeException : public std::exception`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`	`26`
`27`		`- BehaviorTreeException(nonstd::string_view message): message_(message.to_string())`
	`27`	`+ BehaviorTreeException(nonstd::string_view message): message_(nonstd::to_string(message))`
`28`	`28`	`{}`
`29`	`29`
`30`	`30`	`template <typename... SV>`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ inline Result TreeNode::getInput(const std::string& key, T& destination) const`
`208`	`208`	`"but BB is invalid");`
`209`	`209`	`}`
`210`	`210`
`211`		`- const Any* val = config_.blackboard->getAny(remapped_key.to_string());`
	`211`	`+ const Any* val = config_.blackboard->getAny(nonstd::to_string(remapped_key));`
`212`	`212`	`if (val && val->empty() == false)`
`213`	`213`	`{`
`214`	`214`	`if (std::is_same<T, std::string>::value == false && val->type() == typeid(std::string))`
`@@ -258,7 +258,7 @@ inline Result TreeNode::setOutput(const std::string& key, const T& value)`
`258`	`258`	`{`
`259`	`259`	`remapped_key = stripBlackboardPointer(remapped_key);`
`260`	`260`	`}`
`261`		`- const auto& key_str = remapped_key.to_string();`
	`261`	`+ const auto& key_str = nonstd::to_string(remapped_key);`
`262`	`262`
`263`	`263`	`config_.blackboard->set(key_str, value);`
`264`	`264`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ std::string convertFromString<std::string>(StringView str)`
`103`	`103`	`template <>`
`104`	`104`	`const char* convertFromString<const char*>(StringView str)`
`105`	`105`	`{`
`106`		`- return str.to_string().c_str();`
	`106`	`+ return nonstd::to_string(str).c_str();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`template <>`
`@@ -197,7 +197,7 @@ NodeStatus convertFromString<NodeStatus>(StringView str)`
`197`	`197`	`if( str == "RUNNING" ) return NodeStatus::RUNNING;`
`198`	`198`	`if( str == "SUCCESS" ) return NodeStatus::SUCCESS;`
`199`	`199`	`if( str == "FAILURE" ) return NodeStatus::FAILURE;`
`200`		`- throw RuntimeError(std::string("Cannot convert this to NodeStatus: ") + str.to_string() );`
	`200`	`+ throw RuntimeError(std::string("Cannot convert this to NodeStatus: ") + nonstd::to_string(str) );`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`template <>`
`@@ -288,12 +288,12 @@ Any PortInfo::parseString(const std::string &str) const`
`288`	`288`
`289`	`289`	`void PortInfo::setDescription(StringView description)`
`290`	`290`	`{`
`291`		`- description_ = description.to_string();`
	`291`	`+ description_ = nonstd::to_string(description);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`void PortInfo::setDefaultValue(StringView default_value_as_string)`
`295`	`295`	`{`
`296`		`- default_value_ = default_value_as_string.to_string();`
	`296`	`+ default_value_ = nonstd::to_string(default_value_as_string);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`const std::string &PortInfo::description() const`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ TreeNode::Ptr XMLParser::Pimpl::createNodeFromXML(const XMLElement *element,`
`520`	`520`	`auto remapped_res = TreeNode::getRemappedKey(port_name, remapping_value);`
`521`	`521`	`if( remapped_res )`
`522`	`522`	`{`
`523`		`- const auto& port_key = remapped_res.value().to_string();`
	`523`	`+ const auto& port_key = nonstd::to_string(remapped_res.value());`
`524`	`524`
`525`	`525`	`auto prev_info = blackboard->portInfo( port_key );`
`526`	`526`	`if( !prev_info )`