Revision: 8808
http://playerstage.svn.sourceforge.net/playerstage/?rev=8808&view=rev
Author: natepak
Date: 2010-06-29 14:52:18 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Fixed namespace issues
Modified Paths:
--------------
code/gazebo/trunk/player/ActarrayInterface.cc
code/gazebo/trunk/player/ActarrayInterface.hh
code/gazebo/trunk/player/BumperInterface.cc
code/gazebo/trunk/player/BumperInterface.hh
code/gazebo/trunk/player/CMakeLists.txt
code/gazebo/trunk/player/CameraInterface.cc
code/gazebo/trunk/player/CameraInterface.hh
code/gazebo/trunk/player/FiducialInterface.cc
code/gazebo/trunk/player/FiducialInterface.hh
code/gazebo/trunk/player/GazeboClient.cc
code/gazebo/trunk/player/GazeboClient.hh
code/gazebo/trunk/player/GazeboDriver.cc
code/gazebo/trunk/player/GazeboDriver.hh
code/gazebo/trunk/player/GazeboInterface.cc
code/gazebo/trunk/player/GazeboInterface.hh
code/gazebo/trunk/player/GazeboTime.cc
code/gazebo/trunk/player/GazeboTime.hh
code/gazebo/trunk/player/Graphics3dInterface.cc
code/gazebo/trunk/player/Graphics3dInterface.hh
code/gazebo/trunk/player/GripperInterface.cc
code/gazebo/trunk/player/GripperInterface.hh
code/gazebo/trunk/player/IRInterface.cc
code/gazebo/trunk/player/IRInterface.hh
code/gazebo/trunk/player/LaserInterface.cc
code/gazebo/trunk/player/LaserInterface.hh
code/gazebo/trunk/player/OpaqueInterface.cc
code/gazebo/trunk/player/OpaqueInterface.hh
code/gazebo/trunk/player/PTZInterface.cc
code/gazebo/trunk/player/PTZInterface.hh
code/gazebo/trunk/player/Position2dInterface.cc
code/gazebo/trunk/player/Position2dInterface.hh
code/gazebo/trunk/player/Position3dInterface.cc
code/gazebo/trunk/player/Position3dInterface.hh
code/gazebo/trunk/player/SimulationInterface.cc
code/gazebo/trunk/player/SimulationInterface.hh
Modified: code/gazebo/trunk/player/ActarrayInterface.cc
===================================================================
--- code/gazebo/trunk/player/ActarrayInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/ActarrayInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -33,7 +33,7 @@
#include "GazeboDriver.hh"
#include "ActarrayInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *ActarrayInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/ActarrayInterface.hh
===================================================================
--- code/gazebo/trunk/player/ActarrayInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/ActarrayInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -33,7 +33,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
Modified: code/gazebo/trunk/player/BumperInterface.cc
===================================================================
--- code/gazebo/trunk/player/BumperInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/BumperInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -42,7 +42,7 @@
#include "GazeboDriver.hh"
#include "BumperInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *BumperInterface::mutex = NULL;
///////////////////////////////////////////////////////////////////////////////
Modified: code/gazebo/trunk/player/BumperInterface.hh
===================================================================
--- code/gazebo/trunk/player/BumperInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/BumperInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
Modified: code/gazebo/trunk/player/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/player/CMakeLists.txt 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/CMakeLists.txt 2010-06-29 14:52:18 UTC (rev
8808)
@@ -25,7 +25,7 @@
link_directories( ${PLAYER_LINK_DIRS} ${boost_library_dirs} gazeboshm)
-add_library(gazeboplugin SHARED ${gazeboplugin_sources})
-target_link_libraries(gazeboplugin ${PLAYER_LINK_LIBS} gazeboshm )
+add_library(gazeboplayerplugin SHARED ${gazeboplugin_sources})
+target_link_libraries(gazeboplayerplugin ${PLAYER_LINK_LIBS} gazeboshm )
-install(TARGETS gazeboplugin DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+install(TARGETS gazeboplayerplugin DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
Modified: code/gazebo/trunk/player/CameraInterface.cc
===================================================================
--- code/gazebo/trunk/player/CameraInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/CameraInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -32,7 +32,7 @@
#include "GazeboDriver.hh"
#include "CameraInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *CameraInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/CameraInterface.hh
===================================================================
--- code/gazebo/trunk/player/CameraInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/CameraInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
Modified: code/gazebo/trunk/player/FiducialInterface.cc
===================================================================
--- code/gazebo/trunk/player/FiducialInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/FiducialInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -39,7 +39,7 @@
#include "GazeboDriver.hh"
#include "FiducialInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *FiducialInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/FiducialInterface.hh
===================================================================
--- code/gazebo/trunk/player/FiducialInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/FiducialInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
Modified: code/gazebo/trunk/player/GazeboClient.cc
===================================================================
--- code/gazebo/trunk/player/GazeboClient.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboClient.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -32,7 +32,7 @@
#include "GazeboTime.hh"
#include "GazeboClient.hh"
-using namespace gazebo;
+using namespace libgazebo;
Client *GazeboClient::client = NULL;
SimulationIface *GazeboClient::sim = NULL;
Modified: code/gazebo/trunk/player/GazeboClient.hh
===================================================================
--- code/gazebo/trunk/player/GazeboClient.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboClient.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -29,7 +29,7 @@
#include "gz.h"
-namespace gazebo
+namespace libgazebo
{
class SimulationIface;
class Client;
@@ -57,10 +57,10 @@
public: static const char *prefixId;
/// \brief The one and only gazebo client
- public: static gazebo::Client *client;
+ public: static libgazebo::Client *client;
/// \brief The simulation interface
- public: static gazebo::SimulationIface *sim;
+ public: static libgazebo::SimulationIface *sim;
};
/// \}
Modified: code/gazebo/trunk/player/GazeboDriver.cc
===================================================================
--- code/gazebo/trunk/player/GazeboDriver.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboDriver.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -53,7 +53,7 @@
#include "GazeboDriver.hh"
-using namespace gazebo;
+using namespace libgazebo;
/// \brief A factory creation function, declared outside of the class so that
it
/// can be invoked without any object context (alternatively, you can
Modified: code/gazebo/trunk/player/GazeboDriver.hh
===================================================================
--- code/gazebo/trunk/player/GazeboDriver.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboDriver.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -35,7 +35,7 @@
#include "GazeboClient.hh"
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player
Modified: code/gazebo/trunk/player/GazeboInterface.cc
===================================================================
--- code/gazebo/trunk/player/GazeboInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -28,7 +28,7 @@
#include "GazeboInterface.hh"
#include "GazeboDriver.hh"
-using namespace gazebo;
+using namespace libgazebo;
GazeboInterface::GazeboInterface(player_devaddr_t addr, GazeboDriver *driver,
ConfigFile * /*cf*/, int /*section*/)
Modified: code/gazebo/trunk/player/GazeboInterface.hh
===================================================================
--- code/gazebo/trunk/player/GazeboInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -29,7 +29,7 @@
#include <libplayercore/playercore.h>
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player
Modified: code/gazebo/trunk/player/GazeboTime.cc
===================================================================
--- code/gazebo/trunk/player/GazeboTime.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboTime.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -29,7 +29,7 @@
#include "GazeboClient.hh"
#include "GazeboTime.hh"
-using namespace gazebo;
+using namespace libgazebo;
////////////////////////////////////////////////////////////////////////////////
// Constructor
Modified: code/gazebo/trunk/player/GazeboTime.hh
===================================================================
--- code/gazebo/trunk/player/GazeboTime.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/GazeboTime.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -29,7 +29,7 @@
#include <libplayercore/playercore.h>
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player
Modified: code/gazebo/trunk/player/Graphics3dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Graphics3dInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Graphics3dInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -38,7 +38,7 @@
#include "GazeboDriver.hh"
#include "Graphics3dInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *Graphics3dInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/Graphics3dInterface.hh
===================================================================
--- code/gazebo/trunk/player/Graphics3dInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Graphics3dInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
// Forward declarations
Modified: code/gazebo/trunk/player/GripperInterface.cc
===================================================================
--- code/gazebo/trunk/player/GripperInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/GripperInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -42,7 +42,7 @@
#include "GazeboDriver.hh"
#include "GripperInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *GripperInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/GripperInterface.hh
===================================================================
--- code/gazebo/trunk/player/GripperInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/GripperInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
Modified: code/gazebo/trunk/player/IRInterface.cc
===================================================================
--- code/gazebo/trunk/player/IRInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/IRInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -36,7 +36,7 @@
#include "GazeboDriver.hh"
#include "IRInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *IRInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/IRInterface.hh
===================================================================
--- code/gazebo/trunk/player/IRInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/IRInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface Interfaces
Modified: code/gazebo/trunk/player/LaserInterface.cc
===================================================================
--- code/gazebo/trunk/player/LaserInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/LaserInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -36,7 +36,7 @@
#include "GazeboDriver.hh"
#include "LaserInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *LaserInterface::mutex = NULL;
///////////////////////////////////////////////////////////////////////////////
Modified: code/gazebo/trunk/player/LaserInterface.hh
===================================================================
--- code/gazebo/trunk/player/LaserInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/LaserInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface Interfaces
Modified: code/gazebo/trunk/player/OpaqueInterface.cc
===================================================================
--- code/gazebo/trunk/player/OpaqueInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/OpaqueInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -41,7 +41,7 @@
#include "GazeboDriver.hh"
#include "OpaqueInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *OpaqueInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/OpaqueInterface.hh
===================================================================
--- code/gazebo/trunk/player/OpaqueInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/OpaqueInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -33,7 +33,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
Modified: code/gazebo/trunk/player/PTZInterface.cc
===================================================================
--- code/gazebo/trunk/player/PTZInterface.cc 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/PTZInterface.cc 2010-06-29 14:52:18 UTC (rev
8808)
@@ -42,7 +42,7 @@
#include "GazeboDriver.hh"
#include "PTZInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *PTZInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/PTZInterface.hh
===================================================================
--- code/gazebo/trunk/player/PTZInterface.hh 2010-06-28 21:02:18 UTC (rev
8807)
+++ code/gazebo/trunk/player/PTZInterface.hh 2010-06-29 14:52:18 UTC (rev
8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
Modified: code/gazebo/trunk/player/Position2dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Position2dInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Position2dInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -44,7 +44,7 @@
#include "GazeboDriver.hh"
#include "Position2dInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *Position2dInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/Position2dInterface.hh
===================================================================
--- code/gazebo/trunk/player/Position2dInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Position2dInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -35,7 +35,7 @@
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
Modified: code/gazebo/trunk/player/Position3dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Position3dInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Position3dInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -37,7 +37,7 @@
#include "GazeboDriver.hh"
#include "Position3dInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *Position3dInterface::mutex = NULL;
Modified: code/gazebo/trunk/player/Position3dInterface.hh
===================================================================
--- code/gazebo/trunk/player/Position3dInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/Position3dInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -35,7 +35,7 @@
}
// Forward declarations
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface Interfaces
Modified: code/gazebo/trunk/player/SimulationInterface.cc
===================================================================
--- code/gazebo/trunk/player/SimulationInterface.cc 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/SimulationInterface.cc 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -32,7 +32,7 @@
#include "GazeboDriver.hh"
#include "SimulationInterface.hh"
-using namespace gazebo;
+using namespace libgazebo;
boost::recursive_mutex *SimulationInterface::mutex = NULL;
@@ -92,7 +92,7 @@
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
PLAYER_SIMULATION_REQ_SET_POSE3D,
this->device_addr))
{
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
player_simulation_pose3d_req_t *req =
(player_simulation_pose3d_req_t*)(data);
@@ -100,7 +100,7 @@
gzReq = &(this->iface->data->requests[ this->iface->data->requestCount++
]);
- gzReq->type = gazebo::SimulationRequestData::SET_POSE3D;
+ gzReq->type = libgazebo::SimulationRequestData::SET_POSE3D;
strcpy((char*)gzReq->name, req->name);
gzReq->modelPose.pos.x = req->pose.px;
@@ -124,7 +124,7 @@
PLAYER_SIMULATION_REQ_SET_POSE2D,
this->device_addr))
{
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
player_simulation_pose2d_req_t *req =
(player_simulation_pose2d_req_t*)(data);
@@ -133,7 +133,7 @@
gzReq = &(this->iface->data->requests[ this->iface->data->requestCount++]);
- gzReq->type = gazebo::SimulationRequestData::SET_POSE2D;
+ gzReq->type = libgazebo::SimulationRequestData::SET_POSE2D;
strcpy((char*)gzReq->name, req->name);
@@ -153,7 +153,7 @@
PLAYER_SIMULATION_REQ_GET_POSE3D,
this->device_addr))
{
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
player_simulation_pose3d_req_t *req =
(player_simulation_pose3d_req_t*)(data);
@@ -161,7 +161,7 @@
gzReq = &(this->iface->data->requests[this->iface->data->requestCount++]);
- gzReq->type = gazebo::SimulationRequestData::GET_POSE3D;
+ gzReq->type = libgazebo::SimulationRequestData::GET_POSE3D;
strcpy((char*)gzReq->name, req->name);
@@ -173,7 +173,7 @@
PLAYER_SIMULATION_REQ_GET_POSE2D,
this->device_addr))
{
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
player_simulation_pose2d_req_t *req =
(player_simulation_pose2d_req_t*)(data);
@@ -181,7 +181,7 @@
gzReq = &(this->iface->data->requests[this->iface->data->requestCount++]);
- gzReq->type = gazebo::SimulationRequestData::GET_POSE2D;
+ gzReq->type = libgazebo::SimulationRequestData::GET_POSE2D;
strcpy((char*)gzReq->name, req->name);
@@ -233,40 +233,40 @@
else
{
this->iface->Lock(1);
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
gzReq =
&(this->iface->data->requests[this->iface->data->requestCount++]);
if (prop == "num_children")
{
- gzReq->type = gazebo::SimulationRequestData::GET_NUM_CHILDREN;
+ gzReq->type = libgazebo::SimulationRequestData::GET_NUM_CHILDREN;
strcpy((char*)gzReq->name, req->name);
}
else if (prop == "model_name")
{
- gzReq->type = gazebo::SimulationRequestData::GET_MODEL_NAME;
+ gzReq->type = libgazebo::SimulationRequestData::GET_MODEL_NAME;
gzReq->uintValue = req->index;
}
else if (prop == "child_name")
{
- gzReq->type = gazebo::SimulationRequestData::GET_CHILD_NAME;
+ gzReq->type = libgazebo::SimulationRequestData::GET_CHILD_NAME;
gzReq->uintValue = req->index;
strcpy((char*)gzReq->name, req->name);
}
else if (prop == "fiducial_id")
{
- gzReq->type = gazebo::SimulationRequestData::GET_MODEL_FIDUCIAL_ID;
+ gzReq->type = libgazebo::SimulationRequestData::GET_MODEL_FIDUCIAL_ID;
strcpy((char*)gzReq->name, req->name);
}
else if (prop == "model_type")
{
- gzReq->type = gazebo::SimulationRequestData::GET_MODEL_TYPE;
+ gzReq->type = libgazebo::SimulationRequestData::GET_MODEL_TYPE;
strcpy((char*)gzReq->name, req->name);
}
else if ((prop == "num_models") && (name == "world"))
{
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
gzReq =
&(this->iface->data->requests[this->iface->data->requestCount++]);
- gzReq->type = gazebo::SimulationRequestData::GET_NUM_MODELS;
+ gzReq->type = libgazebo::SimulationRequestData::GET_NUM_MODELS;
}
else
{
@@ -281,7 +281,7 @@
this->device_addr))
{
this->iface->Lock(1);
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
gzReq = &(this->iface->data->requests[this->iface->data->requestCount++]);
gzReq->type = SimulationRequestData::PAUSE;
this->iface->Unlock();
@@ -291,7 +291,7 @@
this->device_addr))
{
this->iface->Lock(1);
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
gzReq = &(this->iface->data->requests[this->iface->data->requestCount++]);
gzReq->type = SimulationRequestData::RESET;
this->iface->Unlock();
@@ -301,7 +301,7 @@
this->device_addr))
{
this->iface->Lock(1);
- gazebo::SimulationRequestData *gzReq = NULL;
+ libgazebo::SimulationRequestData *gzReq = NULL;
gzReq = &(this->iface->data->requests[this->iface->data->requestCount++]);
gzReq->type = SimulationRequestData::SAVE;
this->iface->Unlock();
@@ -319,7 +319,7 @@
void SimulationInterface::Update()
{
boost::recursive_mutex::scoped_lock lock(*this->mutex);
- gazebo::SimulationRequestData *response = NULL;
+ libgazebo::SimulationRequestData *response = NULL;
this->iface->Lock(1);
for (unsigned int i=0; i < this->iface->data->responseCount; i++)
@@ -328,16 +328,16 @@
switch (response->type)
{
- case gazebo::SimulationRequestData::SET_STATE:
- case gazebo::SimulationRequestData::GO:
- case gazebo::SimulationRequestData::PAUSE:
- case gazebo::SimulationRequestData::RESET:
- case gazebo::SimulationRequestData::SAVE:
- case gazebo::SimulationRequestData::SET_POSE2D:
- case gazebo::SimulationRequestData::SET_POSE3D:
+ case libgazebo::SimulationRequestData::SET_STATE:
+ case libgazebo::SimulationRequestData::GO:
+ case libgazebo::SimulationRequestData::PAUSE:
+ case libgazebo::SimulationRequestData::RESET:
+ case libgazebo::SimulationRequestData::SAVE:
+ case libgazebo::SimulationRequestData::SET_POSE2D:
+ case libgazebo::SimulationRequestData::SET_POSE3D:
break;
- case gazebo::SimulationRequestData::GET_POSE3D:
+ case libgazebo::SimulationRequestData::GET_POSE3D:
{
if (this->pose3dReq.name_count != strlen(response->name))
@@ -364,7 +364,7 @@
break;
}
- case gazebo::SimulationRequestData::GET_POSE2D:
+ case libgazebo::SimulationRequestData::GET_POSE2D:
{
if (this->pose2dReq.name_count != strlen(response->name))
@@ -388,7 +388,7 @@
break;
}
- case gazebo::SimulationRequestData::GET_MODEL_FIDUCIAL_ID:
+ case libgazebo::SimulationRequestData::GET_MODEL_FIDUCIAL_ID:
{
player_simulation_property_req_t *req ;
memset (req, 0, sizeof(player_simulation_property_req_t));
Modified: code/gazebo/trunk/player/SimulationInterface.hh
===================================================================
--- code/gazebo/trunk/player/SimulationInterface.hh 2010-06-28 21:02:18 UTC
(rev 8807)
+++ code/gazebo/trunk/player/SimulationInterface.hh 2010-06-29 14:52:18 UTC
(rev 8808)
@@ -34,7 +34,7 @@
class recursive_mutex;
}
-namespace gazebo
+namespace libgazebo
{
/// \addtogroup player_iface
/// \{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
