From 3ed601964956365cc8eb8e1292bb17c1408809e9 Mon Sep 17 00:00:00 2001 From: Sergi Hernandez Juan <shernand@iri.upc.edu> Date: Thu, 30 Jul 2020 15:50:04 +0200 Subject: [PATCH] Changed the auto_ptr for the unique_ptr. The added the --std c++11 to the xsdcxx command call. --- src/darwin_mmanager.cpp | 2 +- src/darwin_robot.cpp | 2 +- src/xml/CMakeLists.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/darwin_mmanager.cpp b/src/darwin_mmanager.cpp index 1395e55..52b2a47 100644 --- a/src/darwin_mmanager.cpp +++ b/src/darwin_mmanager.cpp @@ -225,7 +225,7 @@ void CDarwinMManager::load_config(std::string &filename) if(stat(filename.c_str(),&buffer)==0) { try{ - std::auto_ptr<darwin_config_t> cfg(darwin_config(filename.c_str(), xml_schema::flags::dont_validate)); + std::unique_ptr<darwin_config_t> cfg(darwin_config(filename.c_str(), xml_schema::flags::dont_validate)); for(iterator=cfg->servo().begin(),i=0;iterator!=cfg->servo().end();iterator++,i++) this->mm_assign_module(iterator->name(),iterator->motion_module()); }catch(const xml_schema::exception& e){ diff --git a/src/darwin_robot.cpp b/src/darwin_robot.cpp index 3268c37..a4ccba8 100644 --- a/src/darwin_robot.cpp +++ b/src/darwin_robot.cpp @@ -857,7 +857,7 @@ void CDarwinRobot::mm_load_config(std::string &filename) if(stat(filename.c_str(),&buffer)==0) { try{ - std::auto_ptr<darwin_config_t> cfg(darwin_config(filename.c_str(), xml_schema::flags::dont_validate)); + std::unique_ptr<darwin_config_t> cfg(darwin_config(filename.c_str(), xml_schema::flags::dont_validate)); for(iterator=cfg->servo().begin(),i=0;iterator!=cfg->servo().end();iterator++,i++) this->mm_assign_module(iterator->name(),iterator->motion_module()); }catch(const xml_schema::exception& e){ diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index ecf2934..14d732d 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -33,13 +33,13 @@ 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}") - INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iridrivers/xml) - INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iridrivers/xml) + INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iri/${PROJECT_NAME}/xml) + INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iri/${PROJECT_NAME}/xml) ENDIF(XSD_FILES) ENDIF(XSD_FOUND) -- GitLab