diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-28 02:42:20 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-28 02:42:20 (GMT) |
| commit | 1e64dddf1ea30282c89de7f35854a68614234652 (patch) | |
| tree | 165d37c1c66f6ff79d48c74794238b3f0bed09da /src/handle_dep.cc | |
| parent | 5c779159c208ca3d88c88479ab29f9cd66574859 (diff) | |
| parent | d0856efe6da545693f9c50a8a2514a9f999ab5ef (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue159
Diffstat (limited to 'src/handle_dep.cc')
| -rw-r--r-- | src/handle_dep.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/handle_dep.cc b/src/handle_dep.cc index cbf7157..2d6f3ff 100644 --- a/src/handle_dep.cc +++ b/src/handle_dep.cc @@ -6,7 +6,7 @@ #include <boost/foreach.hpp> #include <boost/regex.hpp> #include <boost/filesystem.hpp> -using namespace boost::filesystem; +namespace fs = boost::filesystem; #include "boosty.h" boost::unordered_set<std::string> dependencies; @@ -14,14 +14,14 @@ const char *make_command = NULL; void handle_dep(const std::string &filename) { - path filepath(filename); + fs::path filepath(filename); if ( boosty::is_absolute( filepath )) { dependencies.insert(filename); } else { - dependencies.insert((current_path() / filepath).string()); + dependencies.insert((fs::current_path() / filepath).string()); } - if (!exists(filepath) && make_command) { + if (!fs::exists(filepath) && make_command) { std::stringstream buf; buf << make_command << " '" << boost::regex_replace(filename, boost::regex("'"), "'\\''") << "'"; system(buf.str().c_str()); // FIXME: Handle error |