From 9c7caf63399da646dc65d0a3d6f74ce715f86bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Milk?= <rene.milk@wwu.de>
Date: Wed, 11 Jul 2018 13:23:00 +0200
Subject: [PATCH] [py] fix some deprecated/unused warnings
---
.gitsuper | 4 ++--
python/dune/xt/boundaryinfo.cc | 6 ++++--
python/dune/xt/grid/walker/apply-on.bindings.hh | 2 +-
python/dune/xt/provider.cc | 2 +-
python/dune/xt/types.cc | 2 +-
python/dune/xt/walker.cc | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index 99ae75280..2d1a44ab3 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -14,7 +14,7 @@ status = +a3f7e3b4c5317dc77a3c9d6578dd58d880ffcdc1 config.opts (heads/master)
-87f81bcc161d385bb4d52978b78443f65aa43f02 dune-visibility-demo
+5da0a41a3eb9255c22d4e32d85853feda442ccc4 dune-xt-common (heads/bindings_update)
ecf3bc96b7dc011f2d74923a496b5ad0bd5b1ec7 dune-xt-functions (heads/master)
- +a1b2d81ee823ae8b6cd6d9aea5ce0066dbef9ac0 dune-xt-grid (heads/bindings_update)
+ +6c9c6e404e625fda389c52a9d345089a77d4f25d dune-xt-grid (heads/bindings_update)
c82a8502baddbc85185f1c142945111ba52fa759 dune-xt-la (heads/master)
1a90ca104f7551110c402dbbee50b4fa2a2a0f26 local/bin (remotes/origin/semicolonAsSeperator-89-g1a90ca1)
-d1d56509f0744dc6003234c2b72e393c64faf050 pylrbms
@@ -89,7 +89,7 @@ commit = ecf3bc96b7dc011f2d74923a496b5ad0bd5b1ec7
[submodule.dune-xt-grid]
remote = https://github.com/dune-community/dune-xt-grid.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = a1b2d81ee823ae8b6cd6d9aea5ce0066dbef9ac0
+commit = 6c9c6e404e625fda389c52a9d345089a77d4f25d
[submodule.dune-xt-la]
remote = https://github.com/dune-community/dune-xt-la.git
diff --git a/python/dune/xt/boundaryinfo.cc b/python/dune/xt/boundaryinfo.cc
index 7ee0c77ef..55e16d5a1 100644
--- a/python/dune/xt/boundaryinfo.cc
+++ b/python/dune/xt/boundaryinfo.cc
@@ -71,7 +71,9 @@ struct bind_grid_layer_info<Grid, l, null_template_tuple>
template <class>
-void bind_grid_layer(pybind11::module& m, std::integral_constant<size_t, 0>){};
+void bind_grid_layer(pybind11::module&, std::integral_constant<size_t, 0>)
+{
+}
template <class Grid, size_t counter>
void bind_grid_layer(pybind11::module& m, std::integral_constant<size_t, counter>)
@@ -89,7 +91,7 @@ void bind_grid(pybind11::module& m)
}
template <>
-void bind_grid<boost::tuples::null_type>(pybind11::module& m)
+void bind_grid<boost::tuples::null_type>(pybind11::module&)
{
}
diff --git a/python/dune/xt/grid/walker/apply-on.bindings.hh b/python/dune/xt/grid/walker/apply-on.bindings.hh
index 35738cc95..8a422e8ad 100644
--- a/python/dune/xt/grid/walker/apply-on.bindings.hh
+++ b/python/dune/xt/grid/walker/apply-on.bindings.hh
@@ -116,7 +116,7 @@ public:
_w>:: \
bind(_m, \
_class_name, \
- Dune::XT::Grid::bindings::layer_name<Dune::XT::Grid::Layers::_layer>::value() + "_" \
+ Dune::XT::Grid::layer_names[Dune::XT::Grid::Layers::_layer] + "_" \
+ Dune::XT::Grid::bindings::backend_name<Dune::XT::Grid::Backends::_backend>::value())
/*#if HAVE_ALBERTA
diff --git a/python/dune/xt/provider.cc b/python/dune/xt/provider.cc
index d819068e4..c4e418744 100644
--- a/python/dune/xt/provider.cc
+++ b/python/dune/xt/provider.cc
@@ -45,7 +45,7 @@ void addbind_for_Grid(pybind11::module& m)
} // ... addbind_for_Grid(...)
template <>
-void addbind_for_Grid<boost::tuples::null_type>(pybind11::module& m)
+void addbind_for_Grid<boost::tuples::null_type>(pybind11::module&)
{
}
diff --git a/python/dune/xt/types.cc b/python/dune/xt/types.cc
index a1e15b67e..b7b658166 100644
--- a/python/dune/xt/types.cc
+++ b/python/dune/xt/types.cc
@@ -34,7 +34,7 @@ void addbind_for_Grid(pybind11::module& m, std::vector<std::string>& available_t
template <>
-void addbind_for_Grid<boost::tuples::null_type>(pybind11::module& m, std::vector<std::string>& available_types)
+void addbind_for_Grid<boost::tuples::null_type>(pybind11::module&, std::vector<std::string>&)
{
}
diff --git a/python/dune/xt/walker.cc b/python/dune/xt/walker.cc
index bf8a77d79..2635a3a62 100644
--- a/python/dune/xt/walker.cc
+++ b/python/dune/xt/walker.cc
@@ -58,7 +58,7 @@ void addbind_for_Grid(pybind11::module& m)
} // ... addbind_for_Grid(...)
template <>
-void addbind_for_Grid<boost::tuples::null_type>(pybind11::module& m)
+void addbind_for_Grid<boost::tuples::null_type>(pybind11::module&)
{
}
--
GitLab