diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-15 16:03:04 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-15 16:03:04 (GMT) |
| commit | eb58394e748b3bcca05d85bdacf641f6581b240b (patch) | |
| tree | 6a6e28dbfff9c7e948d31a81ca850fdf61eba669 /src | |
| parent | d3fd45b248bd1ce5df383b5a40732ffba3e7d952 (diff) | |
| parent | 263901c82d02dfb73fba2235de5593e2de0e232f (diff) | |
Merge branch 'winfix1' of github.com:openscad/openscad into mingwcross1
Diffstat (limited to 'src')
| -rw-r--r-- | src/import.cc | 2 | ||||
| -rw-r--r-- | src/linearextrude.cc | 2 | ||||
| -rw-r--r-- | src/rotateextrude.cc | 2 | ||||
| -rw-r--r-- | src/surface.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/import.cc b/src/import.cc index 9d011b0..7c8091c 100644 --- a/src/import.cc +++ b/src/import.cc @@ -237,7 +237,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const std::string ImportNode::toString() const { std::stringstream stream; - fs::path path(this->filename); + fs::path path((std::string)this->filename); stream << this->name(); stream << "(file = " << this->filename << ", " diff --git a/src/linearextrude.cc b/src/linearextrude.cc index 4d2730c..ba9e412 100644 --- a/src/linearextrude.cc +++ b/src/linearextrude.cc @@ -146,7 +146,7 @@ std::string LinearExtrudeNode::toString() const stream << this->name() << "("; if (!this->filename.empty()) { // Ignore deprecated parameters if empty - fs::path path(this->filename); + fs::path path( (std::string) this->filename ); stream << "file = " << this->filename << ", " "layer = " << QuotedString(this->layername) << ", " diff --git a/src/rotateextrude.cc b/src/rotateextrude.cc index 165d03b..dc8ea34 100644 --- a/src/rotateextrude.cc +++ b/src/rotateextrude.cc @@ -115,7 +115,7 @@ std::string RotateExtrudeNode::toString() const stream << this->name() << "("; if (!this->filename.empty()) { // Ignore deprecated parameters if empty - fs::path path(this->filename); + fs::path path((std::string)this->filename); stream << "file = " << this->filename << ", " "layer = " << QuotedString(this->layername) << ", " diff --git a/src/surface.cc b/src/surface.cc index d962e38..2fa3717 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -225,7 +225,7 @@ PolySet *SurfaceNode::evaluate_polyset(class PolySetEvaluator *) const std::string SurfaceNode::toString() const { std::stringstream stream; - fs::path path(this->filename); + fs::path path((std::string)this->filename); stream << this->name() << "(file = " << this->filename << ", " "center = " << (this->center ? "true" : "false") |