From 880d90e4f91b9ba0ec0f407f69bab74e219dcded Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Wed, 28 Aug 2019 14:03:32 +0800 Subject: [PATCH] App: fix virtual function shadowing in PropertyXLinkSub --- src/App/PropertyLinks.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index df3a50730c..04176ff76d 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -1158,12 +1158,6 @@ protected: }; -//FIXME: PropertyXLinkSub hides overloaded virtual functions -#if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Woverloaded-virtual" -#endif - /** Link to one or more (sub)object from the same or different document */ class AppExport PropertyXLinkSub: public PropertyXLink { @@ -1174,10 +1168,12 @@ public: virtual ~PropertyXLinkSub(); + using PropertyXLink::setValue; + void setValue(App::DocumentObject *,const std::vector &SubList, std::vector &&ShadowSubList={}); - void setValue(App::DocumentObject *,std::vector &&SubList={}, + void setValue(App::DocumentObject *,std::vector &&SubList, std::vector &&ShadowSubList={}); void setSubValues(std::vector &&SubList, @@ -1192,10 +1188,6 @@ protected: virtual PropertyXLink *createInstance() const override; }; -#if defined(__clang__) -# pragma clang diagnostic pop -#endif - /** Link to one or more (sub)object(s) of one or more object(s) from the same or different document */