Ticket #38062: patch-include-vigra-accumulator-grammar.hxx.diff

File patch-include-vigra-accumulator-grammar.hxx.diff, 1.4 KB (added by BSeppke (Benjamin Seppke), 9 years ago)
  • include/vigra/accumulator-grammar.hxx

    old new  
    679679    typedef B type;
    680680};
    681681
    682 template <class A0, template <class> class A1, class B0, template <class> class B1>
    683 struct SubstituteModifiers<A1<A0>, B1<B0>, true>
     682template <class A, template <class> class AA, class B, template <class> class BB>
     683struct SubstituteModifiers<AA<A>, BB<B>, true>
    684684{
    685     typedef A1<typename SubstituteModifiers<A0, B0>::type> type;
     685    typedef AA<typename SubstituteModifiers<A, B>::type> type;
    686686};
    687687
    688 template <class A0, class B0, template <class> class B1>
    689 struct SubstituteModifiers<DefaultModifier<A0>, B1<B0>, true>
     688template <class A, class B, template <class> class BB>
     689struct SubstituteModifiers<DefaultModifier<A>, BB<B>, true>
    690690{
    691     typedef B1<typename SubstituteModifiers<A0, B0>::type> type;
     691    typedef BB<typename SubstituteModifiers<A, B>::type> type;
    692692};
    693693
    694 template <class A0, template <class> class A1, class B0, template <class> class B1>
    695 struct SubstituteModifiers<A1<A0>, B1<B0>, false>
     694template <class A, template <class> class AA, class B, template <class> class BB>
     695struct SubstituteModifiers<AA<A>, BB<B>, false>
    696696{
    697     typedef B1<typename SubstituteModifiers<A0, B0>::type> type;
     697    typedef BB<typename SubstituteModifiers<A, B>::type> type;
    698698};
    699699
    700700} // namespace detail