diff --git a/src/lib/iter-source.hpp b/src/lib/iter-source.hpp index 5a4caec07..810a50553 100644 --- a/src/lib/iter-source.hpp +++ b/src/lib/iter-source.hpp @@ -229,13 +229,12 @@ namespace lib { * is passed to one of the IterSource's builder functions, thereby * erasing the specific type information of the template parameter IT */ - template + template> class WrappedLumieraIter - : public IterSource + : public ISO , boost::noncopyable { - using _Base = IterSource; - using Pos = typename _Base::Pos; + using Pos = typename ISO::Pos; IT src_; diff --git a/tests/library/iter-tree-explorer-test.cpp b/tests/library/iter-tree-explorer-test.cpp index d30cab277..30dd26ffa 100644 --- a/tests/library/iter-tree-explorer-test.cpp +++ b/tests/library/iter-tree-explorer-test.cpp @@ -856,15 +856,15 @@ namespace test{ verify_IterSource() { class PrivateSource -// : public IterSource /////////////////////////////////////TODO linearised Mix-in problem + : public IterSource { public: virtual PrivateSource* expandChildren() const =0; }; class VerySpecivicIter - : public WrappedLumieraIter - , public PrivateSource + : public WrappedLumieraIter { public: VerySpecivicIter(uint start)