From 52b799343fc5d80a49c81c03dc6bcfc94de8a45e Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Fri, 4 Aug 2023 12:36:36 -0700
Subject: [PATCH] Revert "Experiment: specify indirect bases"

This reverts commit 4f90d85f9fc15290d6be54d5ae9417bd131b84d9.
---
 tests/test_python_multiple_inheritance.cpp | 16 ----------------
 tests/test_python_multiple_inheritance.py  | 11 -----------
 2 files changed, 27 deletions(-)

diff --git a/tests/test_python_multiple_inheritance.cpp b/tests/test_python_multiple_inheritance.cpp
index d8fdcf1cf..689917158 100644
--- a/tests/test_python_multiple_inheritance.cpp
+++ b/tests/test_python_multiple_inheritance.cpp
@@ -26,14 +26,6 @@ private:
     int drvd_value;
 };
 
-struct CppDrv2 : CppDrvd {
-    explicit CppDrv2(int value) : CppDrvd(value), drv2_value(value * 5) {}
-    int get_drv2_value() const { return drv2_value; }
-
-private:
-    int drv2_value;
-};
-
 } // namespace test_python_multiple_inheritance
 
 TEST_SUBMODULE(python_multiple_inheritance, m) {
@@ -50,12 +42,4 @@ TEST_SUBMODULE(python_multiple_inheritance, m) {
         .def("reset_drvd_value", &CppDrvd::reset_drvd_value)
         .def("get_base_value_from_drvd", &CppDrvd::get_base_value_from_drvd)
         .def("reset_base_value_from_drvd", &CppDrvd::reset_base_value_from_drvd);
-
-#if 1 // This works.
-    py::class_<CppDrv2, CppDrvd>(m, "CppDrv2")
-#else // Apparent undefined behavior.
-    py::class_<CppDrv2, CppDrvd, CppBase>(m, "CppDrv2")
-#endif
-        .def(py::init<int>())
-        .def("get_drv2_value", &CppDrv2::get_drv2_value);
 }
diff --git a/tests/test_python_multiple_inheritance.py b/tests/test_python_multiple_inheritance.py
index 4acc5202e..3bddd67df 100644
--- a/tests/test_python_multiple_inheritance.py
+++ b/tests/test_python_multiple_inheritance.py
@@ -12,10 +12,6 @@ class PPCC(PC, m.CppDrvd):
     pass
 
 
-class PPCC2(PC, m.CppDrv2):
-    pass
-
-
 def test_PC():
     d = PC(11)
     assert d.get_base_value() == 11
@@ -37,10 +33,3 @@ def test_PPCC():
     d.reset_base_value_from_drvd(30)
     assert d.get_base_value() == 30
     assert d.get_base_value_from_drvd() == 30
-
-
-def test_PPCC2():
-    d = PPCC2(13)
-    assert d.get_drv2_value() == 65
-    assert d.get_drvd_value() == 39
-    assert d.get_base_value() == 13