From ccb3180240e775fb0e62249adf9e60bff8591bc8 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Wed, 23 Oct 2019 12:04:45 +0200
Subject: [PATCH] [python.functions] replace more usages of try_register
---
python/dune/xt/functions/checkerboard.cc | 4 ++--
python/dune/xt/functions/function-as-grid-function.cc | 4 ++--
python/dune/xt/functions/gridfunction-interface-1d.cc | 4 ++--
python/dune/xt/functions/gridfunction-interface-2d.cc | 4 ++--
python/dune/xt/functions/gridfunction-interface-3d.cc | 4 ++--
python/dune/xt/functions/indicator.cc | 4 ++--
python/dune/xt/functions/spe10.cc | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/python/dune/xt/functions/checkerboard.cc b/python/dune/xt/functions/checkerboard.cc
index 52c96be5d..7b22187ac 100644
--- a/python/dune/xt/functions/checkerboard.cc
+++ b/python/dune/xt/functions/checkerboard.cc
@@ -42,8 +42,8 @@ void addbind_for_Grid(pybind11::module& m)
template <class Tuple = Dune::XT::Grid::AvailableGridTypes>
void all_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- addbind_for_Grid<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ addbind_for_Grid<typename Tuple::head_type>(m);
});
all_grids<typename Tuple::tail_type>(m);
} // ... addbind_for_Grid(...)
diff --git a/python/dune/xt/functions/function-as-grid-function.cc b/python/dune/xt/functions/function-as-grid-function.cc
index 4bd864a79..fd3639ec7 100644
--- a/python/dune/xt/functions/function-as-grid-function.cc
+++ b/python/dune/xt/functions/function-as-grid-function.cc
@@ -42,8 +42,8 @@ void addbind_for_Grid(pybind11::module& m)
template <class Tuple = Dune::XT::Grid::AvailableGridTypes>
void all_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- addbind_for_Grid<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ addbind_for_Grid<typename Tuple::head_type>(m);
});
all_grids<typename Tuple::tail_type>(m);
} // ... addbind_for_Grid(...)
diff --git a/python/dune/xt/functions/gridfunction-interface-1d.cc b/python/dune/xt/functions/gridfunction-interface-1d.cc
index a576abd84..65186c5dc 100644
--- a/python/dune/xt/functions/gridfunction-interface-1d.cc
+++ b/python/dune/xt/functions/gridfunction-interface-1d.cc
@@ -27,8 +27,8 @@
template <class Tuple = Dune::XT::Grid::Available1dGridTypes>
void bind_all_1d_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m);
});
bind_all_1d_grids<typename Tuple::tail_type>(m);
}
diff --git a/python/dune/xt/functions/gridfunction-interface-2d.cc b/python/dune/xt/functions/gridfunction-interface-2d.cc
index 94c24da53..22a010f76 100644
--- a/python/dune/xt/functions/gridfunction-interface-2d.cc
+++ b/python/dune/xt/functions/gridfunction-interface-2d.cc
@@ -27,8 +27,8 @@
template <class Tuple = Dune::XT::Grid::Available2dGridTypes>
void bind_all_2d_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m);
});
bind_all_2d_grids<typename Tuple::tail_type>(m);
}
diff --git a/python/dune/xt/functions/gridfunction-interface-3d.cc b/python/dune/xt/functions/gridfunction-interface-3d.cc
index 71a6aa7e6..f23e7701f 100644
--- a/python/dune/xt/functions/gridfunction-interface-3d.cc
+++ b/python/dune/xt/functions/gridfunction-interface-3d.cc
@@ -27,8 +27,8 @@
template <class Tuple = Dune::XT::Grid::Available3dGridTypes>
void bind_all_3d_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ Dune::XT::Functions::bindings::addbind_GridFunctionInterface_all_dims<typename Tuple::head_type>(m);
});
bind_all_3d_grids<typename Tuple::tail_type>(m);
}
diff --git a/python/dune/xt/functions/indicator.cc b/python/dune/xt/functions/indicator.cc
index fa25d0863..4e0dbb48d 100644
--- a/python/dune/xt/functions/indicator.cc
+++ b/python/dune/xt/functions/indicator.cc
@@ -42,8 +42,8 @@ void addbind_for_Grid(pybind11::module& m)
template <class Tuple = Dune::XT::Grid::AvailableGridTypes>
void all_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- addbind_for_Grid<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ addbind_for_Grid<typename Tuple::head_type>(m);
});
all_grids<typename Tuple::tail_type>(m);
} // ... addbind_for_Grid(...)
diff --git a/python/dune/xt/functions/spe10.cc b/python/dune/xt/functions/spe10.cc
index a7c7e0440..59cd2f392 100644
--- a/python/dune/xt/functions/spe10.cc
+++ b/python/dune/xt/functions/spe10.cc
@@ -39,8 +39,8 @@ void addbind_for_Grid(pybind11::module& m)
template <class Tuple = Dune::XT::Grid::AvailableGridTypes>
void all_grids(pybind11::module& m)
{
- Dune::XT::Common::bindings::try_register(m, [](auto& m_) { // different grids but same entity
- addbind_for_Grid<typename Tuple::head_type>(m_);
+ Dune::XT::Common::bindings::guarded_bind([&]() { // different grids but same entity
+ addbind_for_Grid<typename Tuple::head_type>(m);
});
all_grids<typename Tuple::tail_type>(m);
}
--
GitLab