From ced37e29c10d247516c5dbc72e8b159adc2793c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Thu, 17 Mar 2016 22:39:16 +0100 Subject: [PATCH] Fix Windows build errors --- src/Gui/ViewProviderOriginFeature.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderBody.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderBody.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Gui/ViewProviderOriginFeature.h b/src/Gui/ViewProviderOriginFeature.h index 588cd3eda7..7bdde15680 100644 --- a/src/Gui/ViewProviderOriginFeature.h +++ b/src/Gui/ViewProviderOriginFeature.h @@ -34,7 +34,7 @@ namespace Gui /** * View provider associated with an App::OriginFeature. */ -class ViewProviderOriginFeature: public ViewProviderGeometryObject { +class GuiExport ViewProviderOriginFeature: public ViewProviderGeometryObject { PROPERTY_HEADER(Gui::ViewProviderOriginFeature); public: diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 775282dbe2..198e957fae 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -112,7 +112,7 @@ void ViewProviderBody::setDisplayMode(const char* ModeName) { PartGui::ViewProviderPartExt::setDisplayMode(ModeName); } -void ViewProviderBody::setOverrideMode(const std::__cxx11::string& mode) { +void ViewProviderBody::setOverrideMode(const std::string& mode) { //if we are in through mode, we need to ensure that the override mode is not set for the body //(as this would result in "tip" mode), it is enough when the children are set to the correct diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index 8ea0c42d8c..49846ea747 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -59,7 +59,7 @@ public: virtual SoGroup* getChildRoot(void) const {return pcBodyChildren;} virtual std::vector claimChildren3D(void)const; virtual void setDisplayMode(const char* ModeName); - virtual void setOverrideMode(const std::__cxx11::string& mode); + virtual void setOverrideMode(const std::string& mode); virtual bool onDelete(const std::vector &);