minor changes

daf@blue-ocean-robotics.com · daf@blue-ocean-robotics.com · commit ac9c9b9b6509 · 2020-04-16T23:07:34.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,8 +105,9 @@ elseif(BUILD_UNIT_TESTS)
     find_package(GTest)
 
     if(NOT GTEST_FOUND)
-        message(WARNING " GTest missing!")
-    endif(NOT GTEST_FOUND)
+        message(WARNING " GTest missing! You may want to follow these instructions:")
+        message(WARNING " https://gist.github.com/Cartexius/4c437c084d6e388288201aadf9c8cdd5")
+    endif()
 
 endif()
 
diff --git a/include/behaviortree_cpp_v3/blackboard.h b/include/behaviortree_cpp_v3/blackboard.h
@@ -183,10 +183,12 @@ class Blackboard
 
     const PortInfo *portInfo(const std::string& key);
 
-    void addSubtreeRemapping(std::string internal, std::string external);
+    void addSubtreeRemapping(StringView internal, StringView external);
 
     void debugMessage() const;
 
+    std::vector<StringView> getKeys() const;
+
   private:
 
     struct Entry{
diff --git a/src/blackboard.cpp b/src/blackboard.cpp
@@ -42,9 +42,9 @@ const PortInfo* Blackboard::portInfo(const std::string &key)
     return &(it->second.port_info);
 }
 
-void Blackboard::addSubtreeRemapping(std::string internal, std::string external)
+void Blackboard::addSubtreeRemapping(StringView internal, StringView external)
 {
-    internal_to_external_.insert( {std::move(internal), std::move(external)} );
+    internal_to_external_.insert( {internal.to_string(), external.to_string()} );
 }
 
 void Blackboard::debugMessage() const
@@ -72,4 +72,15 @@ void Blackboard::debugMessage() const
     }
 }
 
+std::vector<StringView> Blackboard::getKeys() const
+{
+    std::vector<StringView> out;
+    out.reserve( storage_.size() );
+    for(const auto& entry_it: storage_)
+    {
+        out.push_back( entry_it.first );
+    }
+    return out;
+}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ const PortInfo* Blackboard::portInfo(const std::string &key)`
`42`	`42`	`return &(it->second.port_info);`
`43`	`43`	`}`
`44`	`44`
`45`		`-void Blackboard::addSubtreeRemapping(std::string internal, std::string external)`
	`45`	`+void Blackboard::addSubtreeRemapping(StringView internal, StringView external)`
`46`	`46`	`{`
`47`		`- internal_to_external_.insert( {std::move(internal), std::move(external)} );`
	`47`	`+ internal_to_external_.insert( {internal.to_string(), external.to_string()} );`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`void Blackboard::debugMessage() const`
`@@ -72,4 +72,15 @@ void Blackboard::debugMessage() const`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
	`75`	`+std::vector<StringView> Blackboard::getKeys() const`
	`76`	`+{`
	`77`	`+ std::vector<StringView> out;`
	`78`	`+ out.reserve( storage_.size() );`
	`79`	`+ for(const auto& entry_it: storage_)`
	`80`	`+ {`
	`81`	`+ out.push_back( entry_it.first );`
	`82`	`+ }`
	`83`	`+ return out;`
	`84`	`+}`
	`85`	`+`
`75`	`86`	`}`