kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: fix virtual function shadowing in PropertyXLinkSub

Browse Source
This commit is contained in:
Zheng, Lei
2019-08-28 14:03:32 +08:00
committed by wmayer
parent b4c500776d
commit 880d90e4f9
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/PropertyLinks.h
View File

@@ -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<std::string> &SubList,
std::vector<ShadowSub > &&ShadowSubList={});
void setValue(App::DocumentObject *,std::vector<std::string> &&SubList={},
void setValue(App::DocumentObject *,std::vector<std::string> &&SubList,
std::vector<ShadowSub > &&ShadowSubList={});
void setSubValues(std::vector<std::string> &&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
*/