diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:06:44 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:06:44 (GMT) |
| commit | 19ea0f0427a40068a2ee31127c5103a5cc55f5b9 (patch) | |
| tree | f2bf05a5aef2d3a141d90ae576aa1507b5290ffe | |
| parent | ad338d3e46eac0d0277a7000c48972d47f6c0091 (diff) | |
Don't use native() to extract strings from boost::filesystem::path() since that will use wchar under Windows
| -rw-r--r-- | src/context.cc | 2 | ||||
| -rw-r--r-- | src/handle_dep.cc | 2 | ||||
| -rw-r--r-- | src/import.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/context.cc b/src/context.cc index 57df902..354195f 100644 --- a/src/context.cc +++ b/src/context.cc @@ -176,7 +176,7 @@ AbstractNode *Context::evaluate_module(const ModuleInstantiation &inst) const std::string Context::getAbsolutePath(const std::string &filename) const { if (!filename.empty()) { - return absolute(path(this->document_path) / filename).native(); + return absolute(path(this->document_path) / filename).string(); } else { return filename; diff --git a/src/handle_dep.cc b/src/handle_dep.cc index da95a67..d642555 100644 --- a/src/handle_dep.cc +++ b/src/handle_dep.cc @@ -18,7 +18,7 @@ void handle_dep(const std::string &filename) dependencies.insert(filename); } else { - dependencies.insert((current_path() / filepath).native()); + dependencies.insert((current_path() / filepath).string()); } if (!exists(filepath) && make_command) { std::stringstream buf; diff --git a/src/import.cc b/src/import.cc index c55c983..435d06d 100644 --- a/src/import.cc +++ b/src/import.cc @@ -81,7 +81,7 @@ AbstractNode *ImportModule::evaluate(const Context *ctx, const ModuleInstantiati std::string filename = c.getAbsolutePath(v.text); import_type_e actualtype = this->type; if (actualtype == TYPE_UNKNOWN) { - std::string ext = boost::algorithm::to_lower_copy(path(filename).extension().native()); + std::string ext = boost::algorithm::to_lower_copy(path(filename).extension().string()); if (ext == ".stl") actualtype = TYPE_STL; else if (ext == ".off") actualtype = TYPE_OFF; else if (ext == ".dxf") actualtype = TYPE_DXF; |