Skip to content
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

fix: nodelet face_recognition_nodelet.cpp #144

Open
wants to merge 1 commit into
base: indigo
Choose a base branch
from
Open

fix: nodelet face_recognition_nodelet.cpp #144

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
22 changes: 12 additions & 10 deletions src/nodelet/face_recognition_nodelet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <algorithm>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/version.hpp>
Expand Down Expand Up @@ -89,15 +90,15 @@ namespace filesystem3
namespace filesystem
{
#endif
template <>
path& path::append<typename path::iterator>(typename path::iterator lhs, typename path::iterator rhs,
const codecvt_type& cvt)
{
for (; lhs != rhs; ++lhs)
*this /= *lhs;
return *this;
}
path user_expanded_path(const path& p)
// template <>
// path& path::append<typename path::iterator>(typename path::iterator lhs, typename path::iterator rhs,
// const codecvt_type& cvt)
// {
// for (; lhs != rhs; ++lhs)
// *this /= *lhs;
// return *this;
// }
fs::path user_expanded_path(const path& p)
{
path::const_iterator it(p.begin());
std::string user_dir = (*it).string();
Expand All @@ -122,7 +123,8 @@ path user_expanded_path(const path& p)
homedir = pw->pw_dir;
}
ret = path(std::string(homedir));
return ret.append(++it, p.end(), path::codecvt());
// return ret.append(++it, p.end(), path::codecvt());
return ret / p;
}
} // namespace filesystem
} // namespace boost
Expand Down