Skip to content
Snippets Groups Projects
Commit c36b7d2e authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Changed the deprecated auto_ptr to the unique_ptr.

Changed the xsd library to generate code with the C++11 standard.
parent 6fa04cfb
No related branches found
No related tags found
1 merge request!1Changed the deprecated auto_ptr to the unique_ptr.
......@@ -623,7 +623,7 @@ class CTrajectory
}
// load the new trajectory
std::cout << "read file " << filename << std::endl;
std::auto_ptr<traj_t> traj(trajectory(filename.c_str(),xml_schema::flags::dont_validate));
std::unique_ptr<traj_t> traj(trajectory(filename.c_str(),xml_schema::flags::dont_validate));
if(traj->num_motors()!=(this->motor_control->*this->get_num_motors_fnct)())
{
this->motion_access.exit();
......
......@@ -36,7 +36,7 @@ IF(XSD_FOUND)
ADD_CUSTOM_TARGET(xsd_files_gen DEPENDS ${XSD_SOURCES_INT})
ADD_CUSTOM_COMMAND(
OUTPUT ${XSD_SOURCES_INT}
COMMAND xsdcxx cxx-tree --generate-serialization ${XSD_FILES}
COMMAND xsdcxx cxx-tree --std c++11 --generate-serialization ${XSD_FILES}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${XSD_PATH_FILES}
COMMENT "Parsing the xml template file ${XSD_FILES}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment