Commit cbcabffe authored by Akseppal's avatar Akseppal
Browse files

make Server constructor take in const char* instead for char* & update CMakelists.txt

parent 9dc877aa
......@@ -167,9 +167,5 @@ install(FILES
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/meshes/hyq
)
install(DIRECTORY data/hyq_description
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/../
)
SETUP_PROJECT_FINALIZE()
......@@ -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
......
......@@ -30,15 +30,21 @@ OMNIIDL_INCLUDE_DIRECTORIES(
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
FOREACH(IDL ${IDL_SOURCES})
GENERATE_IDL_FILE (${IDL}
GENERATE_IDL_CPP (${IDL}
${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm
)
)
GENERATE_IDL_PYTHON (${IDL}
${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm
)
ENDFOREACH()
FOREACH(IDL ${HPP_CORBASERVER_IDL_SOURCES})
GENERATE_IDL_FILE (${IDL}
GENERATE_IDL_CPP (${IDL}
${HPP_CORBASERVER_DATAROOTDIR}/idl/hpp/corbaserver
)
)
GENERATE_IDL_PYTHON (${IDL}
${HPP_CORBASERVER_DATAROOTDIR}/idl/hpp/corbaserver
)
ENDFOREACH()
ADD_LIBRARY(${LIBRARY_NAME} SHARED
......
......@@ -27,7 +27,7 @@ int main (int argc, char* argv [])
hpp::core::ProblemSolverPtr_t problemSolver (hpp::core::ProblemSolver::create());
CorbaServer corbaServer (problemSolver, argc,
const_cast<const char**> (argv), true);
RbprmServer rbprmServer (argc, argv, true, "rbprmChild");
RbprmServer rbprmServer (argc, const_cast<const char**> (argv), true, "rbprmChild");
rbprmServer.setProblemSolver (problemSolver);
corbaServer.startCorbaServer ();
......
......@@ -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