From 05b9dd60e31531c8e0b281e0e12d5a04dd70aedb Mon Sep 17 00:00:00 2001 From: DeepSOIC Date: Mon, 11 May 2015 20:50:17 +0300 Subject: [PATCH] fix build with MSVC11 aka 2012 --- src/Gui/ViewProviderOrigin.cpp | 1 + src/Gui/ViewProviderOrigin.h | 2 +- src/Mod/PartDesign/App/Body.cpp | 1 + src/Mod/PartDesign/App/FeatureAddSub.cpp | 1 + src/Mod/PartDesign/App/FeatureAddSub.h | 2 +- src/Mod/PartDesign/App/FeaturePrimitive.cpp | 1 + src/Mod/PartDesign/App/FeaturePrimitive.h | 2 +- src/Mod/PartDesign/Gui/TaskFeaturePick.cpp | 2 +- src/Mod/PartDesign/Gui/TaskFeaturePick.h | 2 +- src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp | 2 ++ 10 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Gui/ViewProviderOrigin.cpp b/src/Gui/ViewProviderOrigin.cpp index ef18c1efc..53d043ec8 100644 --- a/src/Gui/ViewProviderOrigin.cpp +++ b/src/Gui/ViewProviderOrigin.cpp @@ -60,6 +60,7 @@ PROPERTY_SOURCE(Gui::ViewProviderOrigin, Gui::ViewProviderGeometryObject) * Creates the view provider for an object group. */ ViewProviderOrigin::ViewProviderOrigin() + : tempVisMode(false) { sPixmap = "CoordinateSystem"; Visibility.setValue(false); diff --git a/src/Gui/ViewProviderOrigin.h b/src/Gui/ViewProviderOrigin.h index bf9802d53..3ecc45a6d 100644 --- a/src/Gui/ViewProviderOrigin.h +++ b/src/Gui/ViewProviderOrigin.h @@ -59,7 +59,7 @@ public: void setTemporaryVisibility(App::DocumentObject* obj, bool onoff); private: - bool tempVisMode = false; + bool tempVisMode; Gui::Document* tempVisDoc; std::map tempVisMap; }; diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp index dc297bd8d..dc99bb13b 100644 --- a/src/Mod/PartDesign/App/Body.cpp +++ b/src/Mod/PartDesign/App/Body.cpp @@ -213,6 +213,7 @@ const bool Body::isSolidFeature(const App::DocumentObject* f) // Transformed Features inside a MultiTransform are not solid features return !isMemberOfMultiTransform(f); } + return false;//DeepSOIC: work-in-progress? } const bool Body::isAllowed(const App::DocumentObject* f) diff --git a/src/Mod/PartDesign/App/FeatureAddSub.cpp b/src/Mod/PartDesign/App/FeatureAddSub.cpp index aaf5a8dfa..c845bb374 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.cpp +++ b/src/Mod/PartDesign/App/FeatureAddSub.cpp @@ -37,6 +37,7 @@ namespace PartDesign { PROPERTY_SOURCE(PartDesign::FeatureAddSub, PartDesign::Feature) FeatureAddSub::FeatureAddSub() + : addSubType(Additive) { ADD_PROPERTY(AddSubShape,(TopoDS_Shape())); } diff --git a/src/Mod/PartDesign/App/FeatureAddSub.h b/src/Mod/PartDesign/App/FeatureAddSub.h index 363349f15..62933f4f0 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.h +++ b/src/Mod/PartDesign/App/FeatureAddSub.h @@ -50,7 +50,7 @@ public: Part::PropertyPartShape AddSubShape; protected: - Type addSubType = Additive; + Type addSubType; }; } //namespace PartDesign diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index 1e3e31a10..a7d7fb3a8 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -38,6 +38,7 @@ namespace PartDesign { PROPERTY_SOURCE(PartDesign::FeaturePrimitive, PartDesign::FeatureAddSub) FeaturePrimitive::FeaturePrimitive() + : primitiveType(Box) { ADD_PROPERTY_TYPE(References, (0,0), "Primitive", (App::PropertyType)(App::Prop_None), "References to build the location of the primitive"); } diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.h b/src/Mod/PartDesign/App/FeaturePrimitive.h index a4b7716f2..68a61bce2 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.h +++ b/src/Mod/PartDesign/App/FeaturePrimitive.h @@ -60,7 +60,7 @@ protected: //calculate the position of the primitive from the support and the exis TopLoc_Location calculateLocation(); - Type primitiveType = Box; + Type primitiveType; }; class PartDesignExport Box : public PartDesign::FeaturePrimitive { diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp index 11f22c56a..fa10baacc 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp @@ -223,7 +223,7 @@ TaskDlgFeaturePick::TaskDlgFeaturePick(std::vector &object const std::vector &status, boost::function)> afunc, boost::function)> wfunc) - : TaskDialog() + : TaskDialog(), accepted(false) { pick = new TaskFeaturePick(objects, status); Content.push_back(pick); diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h index 81f53d7d0..aac5f1daf 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h @@ -113,7 +113,7 @@ public: protected: TaskFeaturePick *pick; - bool accepted = false; + bool accepted; boost::function)> acceptFunction; boost::function)> workFunction; }; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp index 813118190..b634877a8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp @@ -88,6 +88,8 @@ bool ViewProviderPrimitive::setEdit(int ModNum) else { return PartGui::ViewProviderPart::setEdit(ModNum); }*/ + + return false; }