diff --git a/.gitsuper b/.gitsuper index af8e84f03d95ccc7227b4886566b39afa6c5e1a4..7ba5bdf5776180a06b91bbc241d880868a6dc0e0 100644 --- a/.gitsuper +++ b/.gitsuper @@ -12,10 +12,10 @@ status = +a3f7e3b4c5317dc77a3c9d6578dd58d880ffcdc1 config.opts (heads/master) 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5) 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest) -87f81bcc161d385bb4d52978b78443f65aa43f02 dune-visibility-demo - +f4143e9b3f861dc553711e3b322a8d4565ce0614 dune-xt-common (heads/bindings_update) - ecf3bc96b7dc011f2d74923a496b5ad0bd5b1ec7 dune-xt-functions (heads/master) - +916b98050c9bdec9dc9df070dbd5e72af3daef78 dune-xt-grid (heads/master) - c82a8502baddbc85185f1c142945111ba52fa759 dune-xt-la (heads/master) + +5da0a41a3eb9255c22d4e32d85853feda442ccc4 dune-xt-common (heads/bindings_update) + +ca38779bb5364abf454029e6b26a198605326d38 dune-xt-functions (heads/bindings_update) + +8147017cdd9c043e7841163cc4fc46dc51815dcc dune-xt-grid (heads/bindings_update) + +b0835b136ccb221190bfefa22c50938130ad79dc dune-xt-la (heads/bindings_update) 1a90ca104f7551110c402dbbee50b4fa2a2a0f26 local/bin (remotes/origin/semicolonAsSeperator-89-g1a90ca1) -d1d56509f0744dc6003234c2b72e393c64faf050 pylrbms 37f7861dd9b8fd00cc28fc6c80d2b005567e8a0d pymor (0.1.0-3239-g37f7861d) @@ -79,22 +79,22 @@ commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 [submodule.dune-xt-common] remote = https://github.com/dune-community/dune-xt-common.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = f4143e9b3f861dc553711e3b322a8d4565ce0614 +commit = 5da0a41a3eb9255c22d4e32d85853feda442ccc4 [submodule.dune-xt-functions] remote = https://github.com/dune-community/dune-xt-functions.git -status = +2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = ecf3bc96b7dc011f2d74923a496b5ad0bd5b1ec7 +status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) +commit = ca38779bb5364abf454029e6b26a198605326d38 [submodule.dune-xt-grid] remote = https://github.com/dune-community/dune-xt-grid.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 916b98050c9bdec9dc9df070dbd5e72af3daef78 +commit = 8147017cdd9c043e7841163cc4fc46dc51815dcc [submodule.dune-xt-la] remote = https://github.com/dune-community/dune-xt-la.git -status = +2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = c82a8502baddbc85185f1c142945111ba52fa759 +status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) +commit = b0835b136ccb221190bfefa22c50938130ad79dc [submodule.bin] remote = https://github.com/dune-community/local-bin.git diff --git a/dune/xt/common/tuple.hh b/dune/xt/common/tuple.hh index 64725375936e596b7f774517762e6e1e92b46179..8ca159cc27748f1991b1a5f3cad20757e42c24a2 100644 --- a/dune/xt/common/tuple.hh +++ b/dune/xt/common/tuple.hh @@ -361,13 +361,13 @@ template <class... Ms> class template_tuple; namespace internal { -template <class W, class> +template <class B, class...> struct from_tplwrap { - using type = W; + using type = B; }; -template <class... T, template <class...> class B> +template <template <class...> class B, class... T> struct from_tplwrap<tplwrap<B>, T...> { using type = B<T...>;