catkin_make

src/XmlRpcClient.cpp

@@ -11,7 +11,7 @@
 
 
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 // Static data
 const char XmlRpcClient::REQUEST_BEGIN[] = 
@@ -397,7 +397,7 @@ XmlRpcClient::parseResponse(XmlRpcValue& result)
   // Expect either <params><param>... or <fault>...
   if ((XmlRpcUtil::nextTagIs(PARAMS_TAG,_response,&offset) &&
        XmlRpcUtil::nextTagIs(PARAM_TAG,_response,&offset)) ||
-      XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true))
+      (XmlRpcUtil::nextTagIs(FAULT_TAG,_response,&offset) && (_isFault = true)))
   {
     if ( ! result.fromXml(_response, &offset)) {
       XmlRpcUtil::error("Error in XmlRpcClient::parseResponse: Invalid response value. Response:\n%s", _response.c_str());

src/XmlRpcDispatch.cpp

@@ -19,7 +19,7 @@
 #endif  // _WINDOWS
 
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 XmlRpcDispatch::XmlRpcDispatch()

src/XmlRpcServer.cpp

@@ -7,7 +7,7 @@
 #include "robot_xmlrpcpp/XmlRpcException.h"
 
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 XmlRpcServer::XmlRpcServer()

src/XmlRpcServerConnection.cpp

@@ -11,7 +11,7 @@
 
 #endif
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 // Static data
 const char XmlRpcServerConnection::METHODNAME_TAG[] = "<methodName>";

src/XmlRpcServerMethod.cpp

@@ -2,8 +2,7 @@
 #include "robot_xmlrpcpp/XmlRpcServerMethod.h"
 #include "robot_xmlrpcpp/XmlRpcServer.h"
 
-namespace robot {
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   XmlRpcServerMethod::XmlRpcServerMethod(std::string const& name, XmlRpcServer* server)
@@ -19,5 +18,4 @@ namespace XmlRpc {
   }
 
 
-} // namespace XmlRpc
-} // namespace robot
+} // namespace robot_xmlrpcpp 

src/XmlRpcSocket.cpp

@@ -30,7 +30,7 @@ extern "C" {
 #endif // MAKEDEPEND
 
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 

src/XmlRpcSource.cpp

@@ -3,8 +3,7 @@
 #include "robot_xmlrpcpp/XmlRpcSocket.h"
 #include "robot_xmlrpcpp/XmlRpcUtil.h"
 
-namespace robot {
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   XmlRpcSource::XmlRpcSource(int fd /*= -1*/, bool deleteOnClose /*= false*/) 
@@ -33,5 +32,4 @@ namespace XmlRpc {
     }
   }
 
-} // namespace XmlRpc
-} // namespace robot
+} // namespace robot_xmlrpcpp 

src/XmlRpcUtil.cpp

@@ -11,7 +11,7 @@
 
 #include "robot_xmlrpcpp/XmlRpc.h"
 
-using namespace robot::XmlRpc;
+using namespace robot_xmlrpcpp;
 
 
 //#define USE_WINDOWS_DEBUG // To make the error and log messages go to VC++ debug output
@@ -21,7 +21,7 @@ using namespace robot::XmlRpc;
 #endif
 
 // Version id
-const char robot::XmlRpc::XMLRPC_VERSION[] = "XMLRPC++ 0.7";
+const char robot_xmlrpcpp::XMLRPC_VERSION[] = "XMLRPC++ 0.7";
 
 // Default log verbosity: 0 for no messages through 5 (writes everything)
 int XmlRpcLogHandler::_verbosity = 0;
@@ -63,8 +63,8 @@ XmlRpcErrorHandler* XmlRpcErrorHandler::_errorHandler = &defaultErrorHandler;
 
 
 // Easy API for log verbosity
-int robot::XmlRpc::getVerbosity() { return XmlRpcLogHandler::getVerbosity(); }
-void robot::XmlRpc::setVerbosity(int level) { XmlRpcLogHandler::setVerbosity(level); }
+int robot_xmlrpcpp::getVerbosity() { return XmlRpcLogHandler::getVerbosity(); }
+void robot_xmlrpcpp::setVerbosity(int level) { XmlRpcLogHandler::setVerbosity(level); }
 
  
 

src/XmlRpcValue.cpp

@@ -11,8 +11,7 @@
 # include <stdio.h>
 #endif
 
-namespace robot {
-namespace XmlRpc {
+namespace robot_xmlrpcpp {
 
 
   static const char VALUE_TAG[]     = "<value>";
@@ -598,12 +597,11 @@ namespace XmlRpc {
     return os;
   }
 
-} // namespace XmlRpc
-} // namespace robot
+} // namespace robot_xmlrpcpp 
 
 
 // ostream
-std::ostream& operator<<(std::ostream& os, robot::XmlRpc::XmlRpcValue& v) 
+std::ostream& operator<<(std::ostream& os, robot_xmlrpcpp::XmlRpcValue& v) 
 { 
   // If you want to output in xml format:
   //return os << v.toXml();