diff --git a/dartsim/src/plugin.cc b/dartsim/src/plugin.cc index c2db3fdbd..e9c68cd36 100644 --- a/dartsim/src/plugin.cc +++ b/dartsim/src/plugin.cc @@ -46,7 +46,6 @@ struct DartsimFeatures : FeatureList< > { }; class Plugin : - public virtual Implements3d, public virtual Base, public virtual CustomFeatures, public virtual EntityManagementFeatures, diff --git a/include/ignition/physics/detail/FeatureList.hh b/include/ignition/physics/detail/FeatureList.hh index bba4d2b3c..ba9531a9a 100644 --- a/include/ignition/physics/detail/FeatureList.hh +++ b/include/ignition/physics/detail/FeatureList.hh @@ -172,7 +172,7 @@ namespace ignition class ExtractFeatures : public VerifyFeatures { - public: using Result = std::tuple; + public: using type = std::tuple; }; /// \private This specialization of ExtractFeatures is used to wipe away @@ -182,7 +182,7 @@ namespace ignition class ExtractFeatures> : public VerifyFeatures { - public: using Result = std::tuple; + public: using type = std::tuple; }; /// \private This specialization of ExtractFeatures is used to wipe away @@ -195,7 +195,7 @@ namespace ignition void_t> : public VerifyFeatures { - public: using Result = typename SomeFeatureList::Features; + public: using type = typename SomeFeatureList::Features; }; /// \private This specialization skips over any void entries. This allows @@ -204,22 +204,35 @@ namespace ignition template <> class ExtractFeatures { - public: using Result = std::tuple<>; + public: using type = std::tuple<>; }; ///////////////////////////////////////////////// - template + /// \private This struct wraps the TupleContainsBase class to create a + /// tuple filter that can be passed to FilterTuple. + template + struct RedundantTupleFilter + { + template + struct Apply : TupleContainsBase { }; + }; + + ///////////////////////////////////////////////// + template