Commit 02939add authored by stonneau's avatar stonneau Committed by GitHub
Browse files

Merge pull request #3 from jmirabel/devel

Fix compilation issues
parents 3adcaf4d 17b25315
......@@ -167,6 +167,5 @@ install(FILES
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/meshes/hyq
)
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
SETUP_PROJECT_FINALIZE()
Subproject commit d9578712fbc457a528e121bff38ffaa294819686
Subproject commit 9965dbcd2a37edbc98707573c05512d838e64c10
......@@ -31,7 +31,7 @@ namespace hpp {
class HPP_RBPRM_CORBA_DLLAPI Server
{
public:
Server (int argc, char *argv[], bool multiThread = false,
Server (int argc, const char *argv[], bool multiThread = false,
const std::string& poaName = "child");
~Server ();
/// Set planner that will be controlled by server
......
......@@ -22,11 +22,10 @@
typedef hpp::rbprm::Server RbprmServer;
typedef hpp::corbaServer::Server CorbaServer;
int main (int argc, char* argv [])
int main (int argc, const char* argv [])
{
hpp::core::ProblemSolverPtr_t problemSolver (hpp::core::ProblemSolver::create());
CorbaServer corbaServer (problemSolver, argc,
const_cast<const char**> (argv), true);
CorbaServer corbaServer (problemSolver, argc, argv, true);
RbprmServer rbprmServer (argc, argv, true, "rbprmChild");
rbprmServer.setProblemSolver (problemSolver);
......
......@@ -23,7 +23,7 @@
namespace hpp {
namespace rbprm {
Server::Server (int argc, char *argv[], bool multiThread,
Server::Server (int argc, const char *argv[], bool multiThread,
const std::string& poaName) :
rbprmBuilder_ (new corba::Server <impl::RbprmBuilder>
(argc, argv, multiThread, poaName)) {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment