summaryrefslogtreecommitdiff
path: root/src/handle_dep.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-08-20 23:49:00 (GMT)
committerMarius Kintel <marius@kintel.net>2012-08-20 23:49:00 (GMT)
commit1e56bf65b940f4d71104a358d3fea1e06f0ee461 (patch)
tree1b680054e9708eb66aa83264f7ac8941147b82d5 /src/handle_dep.cc
parentb5cc07098b354bbeec2eae3cf6834e28ad43913e (diff)
parent765f1a98dc124e1913b53ea8467908b8b8bda032 (diff)
Merge commit '765f1a98dc124e1913b53ea8467908b8b8bda032'
Diffstat (limited to 'src/handle_dep.cc')
-rw-r--r--src/handle_dep.cc8
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
contact: Jan Huwald // Impressum