adapt enum to new names

ros2 · Jan 10, 2018 · ed4094a · ed4094a
1 parent 44eb4ca
commit ed4094a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/rclcpp/include/rclcpp/parameter.hpp b/rclcpp/include/rclcpp/parameter.hpp
@@ -38,7 +38,7 @@ enum ParameterType
   PARAMETER_INTEGER = rcl_interfaces::msg::ParameterType::PARAMETER_INTEGER,
   PARAMETER_DOUBLE = rcl_interfaces::msg::ParameterType::PARAMETER_DOUBLE,
   PARAMETER_STRING = rcl_interfaces::msg::ParameterType::PARAMETER_STRING,
-  PARAMETER_BYTES = rcl_interfaces::msg::ParameterType::PARAMETER_BYTES,
+  PARAMETER_BYTE_ARRAY = rcl_interfaces::msg::ParameterType::PARAMETER_BYTE_ARRAY,
 };
 
 // Structure to store an arbitrary parameter with templated get/set methods
@@ -128,10 +128,10 @@ class ParameterVariant
 
   template<ParameterType type>
   typename std::enable_if<
-    type == ParameterType::PARAMETER_BYTES, const std::vector<uint8_t> &>::type
+    type == ParameterType::PARAMETER_BYTE_ARRAY, const std::vector<uint8_t> &>::type
   get_value() const
   {
-    if (value_.type != rcl_interfaces::msg::ParameterType::PARAMETER_BYTES) {
+    if (value_.type != rcl_interfaces::msg::ParameterType::PARAMETER_BYTE_ARRAY) {
       // TODO(wjwwood): use custom exception
       throw std::runtime_error("Invalid type");
     }
@@ -175,7 +175,7 @@ class ParameterVariant
       type, const std::vector<uint8_t> &>::value, const std::vector<uint8_t> &>::type
   get_value() const
   {
-    return get_value<ParameterType::PARAMETER_BYTES>();
+    return get_value<ParameterType::PARAMETER_BYTE_ARRAY>();
   }
 
   RCLCPP_PUBLIC

diff --git a/rclcpp/src/rclcpp/parameter.cpp b/rclcpp/src/rclcpp/parameter.cpp
@@ -80,7 +80,7 @@ ParameterVariant::ParameterVariant(
 : name_(name)
 {
   value_.byte_values = byte_values;
-  value_.type = rcl_interfaces::msg::ParameterType::PARAMETER_BYTES;
+  value_.type = rcl_interfaces::msg::ParameterType::PARAMETER_BYTE_ARRAY;
 }
 
 ParameterType
@@ -101,7 +101,7 @@ ParameterVariant::get_type_name() const
       return "double";
     case rclcpp::parameter::ParameterType::PARAMETER_STRING:
       return "string";
-    case rclcpp::parameter::ParameterType::PARAMETER_BYTES:
+    case rclcpp::parameter::ParameterType::PARAMETER_BYTE_ARRAY:
       return "bytes";
     case rclcpp::parameter::ParameterType::PARAMETER_NOT_SET:
       return "not set";
@@ -152,7 +152,7 @@ ParameterVariant::as_bool() const
 const std::vector<uint8_t> &
 ParameterVariant::as_bytes() const
 {
-  return get_value<ParameterType::PARAMETER_BYTES>();
+  return get_value<ParameterType::PARAMETER_BYTE_ARRAY>();
 }
 
 ParameterVariant
@@ -167,7 +167,7 @@ ParameterVariant::from_parameter(const rcl_interfaces::msg::Parameter & paramete
       return ParameterVariant(parameter.name, parameter.value.double_value);
     case PARAMETER_STRING:
       return ParameterVariant(parameter.name, parameter.value.string_value);
-    case PARAMETER_BYTES:
+    case PARAMETER_BYTE_ARRAY:
       return ParameterVariant(parameter.name, parameter.value.byte_values);
     case PARAMETER_NOT_SET:
       throw std::runtime_error("Type from ParameterValue is not set");
@@ -201,7 +201,7 @@ ParameterVariant::value_to_string() const
       return std::to_string(as_double());
     case rclcpp::parameter::ParameterType::PARAMETER_STRING:
       return as_string();
-    case rclcpp::parameter::ParameterType::PARAMETER_BYTES:
+    case rclcpp::parameter::ParameterType::PARAMETER_BYTE_ARRAY:
       {
         std::stringstream bytes;
         bool first_byte = true;