Skip to content

Support for boost filesystem v2 #11

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

Merged
merged 1 commit into from
Jan 23, 2013
Merged

Support for boost filesystem v2 #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions include/pluginlib/class_loader_imp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,11 @@ namespace pluginlib
}
else if (boost::filesystem::exists(parent / "manifest.xml"))
{
#if BOOST_FILESYSTEM_VERSION >= 3
std::string package = parent.filename().string();
#else
std::string package = parent.filename();
#endif
std::string package_path = ros::package::getPath(package);

if (plugin_xml_file_path.find(package_path) == 0) //package_path is a substr of passed plugin xml path
Expand All @@ -416,7 +420,11 @@ namespace pluginlib
std::string ClassLoader<T>::getPathSeparator()
/***************************************************************************/
{
#if BOOST_FILESYSTEM_VERSION >= 3
return(boost::filesystem::path("/").native());
#else
return(boost::filesystem::path("/").external_file_string());
#endif
}


Expand Down