update

include/robot_costmap_2d/costmap_2d_robot.h

@@ -55,18 +55,18 @@
 
 #include <robot/node_handle.h>
 #include <robot/plugin_loader_helper.h>
-class SuperValue : public robot::XmlRpc::XmlRpcValue
+class SuperValue : public robot_xmlrpcpp::XmlRpcValue
 {
 public:
-  void setStruct(robot::XmlRpc::XmlRpcValue::ValueStruct* a)
+  void setStruct(robot_xmlrpcpp::XmlRpcValue::ValueStruct* a)
   {
     _type = TypeStruct;
-    _value.asStruct = new robot::XmlRpc::XmlRpcValue::ValueStruct(*a);
+    _value.asStruct = new robot_xmlrpcpp::XmlRpcValue::ValueStruct(*a);
   }
-  void setArray(robot::XmlRpc::XmlRpcValue::ValueArray* a)
+  void setArray(robot_xmlrpcpp::XmlRpcValue::ValueArray* a)
   {
     _type = TypeArray;
-    _value.asArray = new std::vector<robot::XmlRpc::XmlRpcValue>(*a);
+    _value.asArray = new std::vector<robot_xmlrpcpp::XmlRpcValue>(*a);
   }
 };
 

include/robot_costmap_2d/footprint.h

@@ -136,7 +136,7 @@ std::vector<robot_geometry_msgs::Point> makeFootprintFromParams(robot::NodeHandl
  * @param full_param_name this is the full name of the rosparam from
  * which the footprint_xmlrpc value came.  It is used only for
  * reporting errors. */
-std::vector<robot_geometry_msgs::Point> makeFootprintFromXMLRPC(robot::XmlRpc::XmlRpcValue& footprint_xmlrpc,
+std::vector<robot_geometry_msgs::Point> makeFootprintFromXMLRPC(robot_xmlrpcpp::XmlRpcValue& footprint_xmlrpc,
                                 const std::string& full_param_name);
 
 // /** @brief Write the current unpadded_footprint_ to the "footprint"

src/footprint.cpp

@@ -249,25 +249,25 @@ std::vector<robot_geometry_msgs::Point> makeFootprintFromParams(robot::NodeHandl
 //   nh.setParam("footprint", oss.str().c_str());
 // }
 
-double getNumberFromXMLRPC(robot::XmlRpc::XmlRpcValue& value, const std::string& full_param_name)
+double getNumberFromXMLRPC(robot_xmlrpcpp::XmlRpcValue& value, const std::string& full_param_name)
 {
   // Make sure that the value we're looking at is either a double or an int.
-  if (value.getType() != robot::XmlRpc::XmlRpcValue::TypeInt &&
+  if (value.getType() != robot_xmlrpcpp::XmlRpcValue::TypeInt &&
-      value.getType() != robot::XmlRpc::XmlRpcValue::TypeDouble)
+      value.getType() != robot_xmlrpcpp::XmlRpcValue::TypeDouble)
   {
     std::string& value_string = value;
     printf("Values in the footprint specification (param %s) must be numbers. Found value %s.\n",
                full_param_name.c_str(), value_string.c_str());
     throw std::runtime_error("Values in the footprint specification must be numbers");
   }
-  return value.getType() == robot::XmlRpc::XmlRpcValue::TypeInt ? (int)(value) : (double)(value);
+  return value.getType() == robot_xmlrpcpp::XmlRpcValue::TypeInt ? (int)(value) : (double)(value);
 }
 
-std::vector<robot_geometry_msgs::Point> makeFootprintFromXMLRPC(robot::XmlRpc::XmlRpcValue& footprint_xmlrpc,
+std::vector<robot_geometry_msgs::Point> makeFootprintFromXMLRPC(robot_xmlrpcpp::XmlRpcValue& footprint_xmlrpc,
                                 const std::string& full_param_name)
 {
   // Make sure we have an array of at least 3 elements.
-  if (footprint_xmlrpc.getType() != robot::XmlRpc::XmlRpcValue::TypeArray ||
+  if (footprint_xmlrpc.getType() != robot_xmlrpcpp::XmlRpcValue::TypeArray ||
       footprint_xmlrpc.size() < 3)
   {
     printf("The footprint must be specified as list of lists on the parameter server, %s was specified as %s\n",
@@ -282,8 +282,8 @@ std::vector<robot_geometry_msgs::Point> makeFootprintFromXMLRPC(robot::XmlRpc::X
   for (int i = 0; i < footprint_xmlrpc.size(); ++i)
   {
     // Make sure each element of the list is an array of size 2. (x and y coordinates)
-    robot::XmlRpc::XmlRpcValue point = footprint_xmlrpc[ i ];
+    robot_xmlrpcpp::XmlRpcValue point = footprint_xmlrpc[ i ];
-    if (point.getType() != robot::XmlRpc::XmlRpcValue::TypeArray ||
+    if (point.getType() != robot_xmlrpcpp::XmlRpcValue::TypeArray ||
         point.size() != 2)
     {
       printf("The footprint (parameter %s) must be specified as list of lists on the parameter server eg: "