From 56b3cbef0987462628b506308d255c1d2a5feda1 Mon Sep 17 00:00:00 2001 From: Jakob Schwendner Date: Wed, 27 Jul 2016 13:48:38 +0200 Subject: [PATCH 1/2] The master of urdf_model (tag 1.0.0) is now using c++11 features. --- CMakeLists.txt | 2 ++ src/SMURFParser.cpp | 6 +++--- src/SMURFParser.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b4f3ea..c7193fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,8 @@ include(FindPkgConfig) find_package(lib_manager) define_module_info() +add_definitions(-std=c++11) + #find_package(Doxygen) #if(DOXYGEN_FOUND) #configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) diff --git a/src/SMURFParser.cpp b/src/SMURFParser.cpp index 1cbe804..b460f6c 100644 --- a/src/SMURFParser.cpp +++ b/src/SMURFParser.cpp @@ -30,7 +30,7 @@ namespace smurf_parser { - boost::shared_ptr parseFile(configmaps::ConfigMap* map, + std::shared_ptr parseFile(configmaps::ConfigMap* map, std::string path, std::string smurffilename, bool expandURIs) { path+="/"; // secure that path and file are combined correctly @@ -54,9 +54,9 @@ namespace smurf_parser { // parse URDF model and return fprintf(stderr, " ...loading urdf data from %s.\n", urdfpath.c_str()); - boost::shared_ptr model = urdf::parseURDFFile(urdfpath); + std::shared_ptr model = urdf::parseURDFFile(urdfpath); if (!model) { - return boost::shared_ptr(); + return std::shared_ptr(); } return model; } diff --git a/src/SMURFParser.h b/src/SMURFParser.h index 8c8f056..c4b00a6 100644 --- a/src/SMURFParser.h +++ b/src/SMURFParser.h @@ -35,7 +35,7 @@ namespace smurf_parser { - boost::shared_ptr parseFile(configmaps::ConfigMap* map, + std::shared_ptr parseFile(configmaps::ConfigMap* map, std::string path, std::string smurffilename, bool expandURIs); } // end of namespace smurf_parser From e4e417a7dce7ee16b6fbdc05f85ba957f55fbd35 Mon Sep 17 00:00:00 2001 From: Jakob Schwendner Date: Wed, 27 Jul 2016 13:49:02 +0200 Subject: [PATCH 2/2] added gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build