diff --git a/src/lib/iter-tree-explorer.hpp b/src/lib/iter-tree-explorer.hpp index 9de94078e..801d969ec 100644 --- a/src/lib/iter-tree-explorer.hpp +++ b/src/lib/iter-tree-explorer.hpp @@ -366,8 +366,13 @@ namespace lib { using SrcVal = typename SrcIter::value_type; }; - - + }//(End) TreeExplorer traits + + + + + + namespace iter_explorer { // Implementation of Iterator decorating layers... /** * @internal technical details of binding a functor into the TreeExplorer. @@ -395,7 +400,7 @@ namespace lib { * @tparam SRC the source iterator type to apply when attempting to use a generic lambda as functor */ template - struct _BoundFunctorTraits + struct _BoundFunctor { /** handle all regular "function-like" entities */ template @@ -455,12 +460,7 @@ namespace lib { }; }; - }//(End) TreeExplorer traits - - - - - namespace iter_explorer { // Implementation of Iterator decorating layers... + /** * @internal Base of pipe processing decorator chain. @@ -517,7 +517,7 @@ namespace lib { : public SRC { static_assert(can_IterForEach::value, "Lumiera Iterator required as source"); - using _Traits = _BoundFunctorTraits; + using _Traits = _BoundFunctor; using ExpandFunctor = typename _Traits::Functor; using ResIter = typename _DecoratorTraits::SrcIter; @@ -661,7 +661,7 @@ namespace lib { : public SRC { static_assert(can_IterForEach::value, "Lumiera Iterator required as source"); - using _Traits = _BoundFunctorTraits; + using _Traits = _BoundFunctor; using Res = typename _Traits::Res; using TransformFunctor = typename _Traits::Functor; @@ -748,7 +748,7 @@ namespace lib { : public SRC { static_assert(can_IterForEach::value, "Lumiera Iterator required as source"); - using _Traits = _BoundFunctorTraits; + using _Traits = _BoundFunctor; using Res = typename _Traits::Res; static_assert(std::is_constructible::value, "Functor must be a predicate"); diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 7b084d35b..b92f0c85e 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -7602,7 +7602,7 @@ - + @@ -7974,8 +7974,8 @@ - - + + @@ -8014,7 +8014,7 @@ - + @@ -8037,7 +8037,8 @@ - + + @@ -8067,6 +8068,21 @@ + + + + + + + + + + + + + + + @@ -8082,8 +8098,8 @@ - - + +