more fixup after rebase

Signed-off-by: William Woodall <william@osrfoundation.org>
ros2 · Jan 30, 2019 · 4aab3fe · 4aab3fe
1 parent e114481
commit 4aab3fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/rclcpp/include/rclcpp/parameter.hpp b/rclcpp/include/rclcpp/parameter.hpp
@@ -30,6 +30,10 @@ namespace rclcpp
 
 class Parameter;
 
+namespace node_interfaces{
+struct ParameterInfo;
+}  // namespace node_interfaces
+
 namespace detail
 {
 
@@ -58,6 +62,9 @@ class Parameter
   {
   }
 
+  RCLCPP_PUBLIC
+  explicit Parameter(const rclcpp::node_interfaces::ParameterInfo & parameter_info);
+
   RCLCPP_PUBLIC
   ParameterType
   get_type() const;

diff --git a/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp b/rclcpp/src/rclcpp/node_interfaces/node_parameters.cpp
@@ -392,7 +392,7 @@ NodeParameters::get_parameters_by_prefix(
   for (const auto & param : parameters_) {
     if (param.first.find(prefix_with_dot) == 0 && param.first.length() > prefix_with_dot.length()) {
       // Found one!
-      parameters[param.first.substr(prefix_with_dot.length())] = param.second;
+      parameters[param.first.substr(prefix_with_dot.length())] = rclcpp::Parameter(param.second);
       ret = true;
     }
   }

diff --git a/rclcpp/src/rclcpp/parameter.cpp b/rclcpp/src/rclcpp/parameter.cpp
@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "rclcpp/parameter.hpp"
+
 #include <ostream>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "rclcpp/parameter.hpp"
+#include "rclcpp/node_interfaces/node_parameters.hpp"
 #include "rclcpp/utilities.hpp"
 
 using rclcpp::ParameterType;
@@ -33,6 +35,11 @@ Parameter::Parameter(const std::string & name, const rclcpp::ParameterValue & va
 {
 }
 
+Parameter::Parameter(const rclcpp::node_interfaces::ParameterInfo & parameter_info)
+: Parameter(parameter_info.descriptor.name, parameter_info.value)
+{
+}
+
 ParameterType
 Parameter::get_type() const
 {