Skip to content

C++11 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

C++11 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56b3cbe
The master of urdf_model (tag 1.0.0) is now using c++11 features.
jakobs Jul 27, 2016
e4e417a
added gitignore
jakobs Jul 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/SMURFParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace smurf_parser {

boost::shared_ptr<urdf::ModelInterface> parseFile(configmaps::ConfigMap* map,
std::shared_ptr<urdf::ModelInterface> parseFile(configmaps::ConfigMap* map,
std::string path, std::string smurffilename, bool expandURIs) {

path+="/"; // secure that path and file are combined correctly
Expand All @@ -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<urdf::ModelInterface> model = urdf::parseURDFFile(urdfpath);
std::shared_ptr<urdf::ModelInterface> model = urdf::parseURDFFile(urdfpath);
if (!model) {
return boost::shared_ptr<urdf::ModelInterface>();
return std::shared_ptr<urdf::ModelInterface>();
}
return model;
}
Expand Down
2 changes: 1 addition & 1 deletion src/SMURFParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

namespace smurf_parser {

boost::shared_ptr<urdf::ModelInterface> parseFile(configmaps::ConfigMap* map,
std::shared_ptr<urdf::ModelInterface> parseFile(configmaps::ConfigMap* map,
std::string path, std::string smurffilename, bool expandURIs);

} // end of namespace smurf_parser
Expand Down