Ensure demo is built with the correct C++ standard

Author: sarlinpe

tests/demo-lib/include/demo/Foo.h

@@ -5,7 +5,7 @@ namespace demo{
 
 
 class CppException : public std::runtime_error {
-  //using std::runtime_error;
+  using std::runtime_error::runtime_error;
 };
 
 struct Foo {

tests/install-demo-module.sh

@@ -59,7 +59,10 @@ install_pybind11() {
 }
 
 install_demo() {
-  cmake -S "${TESTS_ROOT}/demo-lib" -B "${BUILD_ROOT}/demo"
+  cmake \
+    -S "${TESTS_ROOT}/demo-lib" \
+    -B "${BUILD_ROOT}/demo" \
+    -DCMAKE_CXX_STANDARD=17
   cmake --build "${BUILD_ROOT}/demo"
   cmake --install "${BUILD_ROOT}/demo" \
         --prefix "${INSTALL_PREFIX}"

tests/py-demo/bindings/src/modules/methods.cpp

@@ -1,6 +1,6 @@
 #include "modules.h"
 
-namespace mymodules {
+namespace {
 struct Dummy {
     int regular_method(int x) { return x + 1; }
     static int static_method(int x) { return x + 1; }
@@ -9,8 +9,8 @@ struct Dummy {
 } // namespace
 
 void bind_methods_module(py::module&& m) {
-    auto &&pyDummy = py::class_<mymodules::Dummy>(m, "Dummy");
+    auto &&pyDummy = py::class_<Dummy>(m, "Dummy");
 
-    pyDummy.def_static("static_method", &mymodules::Dummy::static_method);
-    pyDummy.def("regular_method", &mymodules::Dummy::regular_method);
+    pyDummy.def_static("static_method", &Dummy::static_method);
+    pyDummy.def("regular_method", &Dummy::regular_method);
 }

tests/py-demo/bindings/src/modules/values.cpp

@@ -4,15 +4,15 @@
 
 #include <chrono>
 
-namespace myvalues {
+namespace {
 class Dummy {};
 class Foo {};
 } // namespace
 
 void bind_values_module(py::module &&m) {
     {
         // python module as value
-        auto &&pyDummy = py::class_<myvalues::Dummy>(m, "Dummy");
+        auto &&pyDummy = py::class_<Dummy>(m, "Dummy");
 
         pyDummy.def_property_readonly_static(
             "linalg", [](py::object &) { return py::module::import("numpy.linalg"); });
@@ -27,12 +27,12 @@ void bind_values_module(py::module &&m) {
         m.attr("list_with_none") = li;
     }
     {
-        auto pyFoo = py::class_<myvalues::Foo>(m, "Foo");
-        m.attr("foovar") = myvalues::Foo();
+        auto pyFoo = py::class_<Foo>(m, "Foo");
+        m.attr("foovar") = Foo();
 
         py::list foolist;
-        foolist.append(myvalues::Foo());
-        foolist.append(myvalues::Foo());
+        foolist.append(Foo());
+        foolist.append(Foo());
 
         m.attr("foolist") = foolist;
         m.attr("none") = py::none();