From ef142079141382f5f6c9382b57dbb953f2faa896 Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <mail@bastibl.net>
Date: Tue, 20 Jul 2021 11:24:14 +0200
Subject: [PATCH] fix python bindings

---
 include/ieee802_11/signal_field.h                |  6 ------
 python/bindings/constellations_python.cc         |  8 ++++----
 .../docstrings/signal_field_pydoc_template.h     |  6 ------
 python/bindings/signal_field_python.cc           | 16 ++--------------
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/include/ieee802_11/signal_field.h b/include/ieee802_11/signal_field.h
index ef0bcc5..e29a506 100644
--- a/include/ieee802_11/signal_field.h
+++ b/include/ieee802_11/signal_field.h
@@ -30,12 +30,6 @@ class IEEE802_11_API signal_field : virtual public digital::packet_header_defaul
 public:
     typedef std::shared_ptr<signal_field> sptr;
     static sptr make();
-    sptr base() {
-        return std::dynamic_pointer_cast<signal_field>(shared_from_this());
-    }
-    sptr formatter() {
-        return std::dynamic_pointer_cast<signal_field>(shared_from_this());
-    }
 
 protected:
     signal_field();
diff --git a/python/bindings/constellations_python.cc b/python/bindings/constellations_python.cc
index 0b2ca6b..368214a 100644
--- a/python/bindings/constellations_python.cc
+++ b/python/bindings/constellations_python.cc
@@ -37,7 +37,7 @@ void bind_constellations(py::module& m)
 
 
     py::class_<constellation_bpsk, gr::digital::constellation,
-        std::shared_ptr<constellation_bpsk>>(m, "constellation_bpsk", D(constellation_bpsk))
+        std::shared_ptr<constellation_bpsk>>(m, "constellation_bpsk", D(constellation_bpsk), py::multiple_inheritance())
 
         .def(py::init(&constellation_bpsk::make),
            D(constellation_bpsk,make)
@@ -56,7 +56,7 @@ void bind_constellations(py::module& m)
 
 
     py::class_<constellation_qpsk, gr::digital::constellation,
-        std::shared_ptr<constellation_qpsk>>(m, "constellation_qpsk", D(constellation_qpsk))
+        std::shared_ptr<constellation_qpsk>>(m, "constellation_qpsk", D(constellation_qpsk), py::multiple_inheritance())
 
         .def(py::init(&constellation_qpsk::make),
            D(constellation_qpsk,make)
@@ -75,7 +75,7 @@ void bind_constellations(py::module& m)
 
 
     py::class_<constellation_16qam, gr::digital::constellation,
-        std::shared_ptr<constellation_16qam>>(m, "constellation_16qam", D(constellation_16qam))
+        std::shared_ptr<constellation_16qam>>(m, "constellation_16qam", D(constellation_16qam), py::multiple_inheritance())
 
         .def(py::init(&constellation_16qam::make),
            D(constellation_16qam,make)
@@ -94,7 +94,7 @@ void bind_constellations(py::module& m)
 
 
     py::class_<constellation_64qam, gr::digital::constellation,
-        std::shared_ptr<constellation_64qam>>(m, "constellation_64qam", D(constellation_64qam))
+        std::shared_ptr<constellation_64qam>>(m, "constellation_64qam", D(constellation_64qam), py::multiple_inheritance())
 
         .def(py::init(&constellation_64qam::make),
            D(constellation_64qam,make)
diff --git a/python/bindings/docstrings/signal_field_pydoc_template.h b/python/bindings/docstrings/signal_field_pydoc_template.h
index 3680993..3703b0f 100644
--- a/python/bindings/docstrings/signal_field_pydoc_template.h
+++ b/python/bindings/docstrings/signal_field_pydoc_template.h
@@ -24,10 +24,4 @@
 
  static const char *__doc_gr_ieee802_11_signal_field_make = R"doc()doc";
 
-
- static const char *__doc_gr_ieee802_11_signal_field_base = R"doc()doc";
-
-
- static const char *__doc_gr_ieee802_11_signal_field_formatter = R"doc()doc";
-
   
diff --git a/python/bindings/signal_field_python.cc b/python/bindings/signal_field_python.cc
index 6daea5a..1593d95 100644
--- a/python/bindings/signal_field_python.cc
+++ b/python/bindings/signal_field_python.cc
@@ -14,7 +14,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
 /* BINDTOOL_USE_PYGCCXML(0)                                                        */
 /* BINDTOOL_HEADER_FILE(signal_field.h)                                        */
-/* BINDTOOL_HEADER_FILE_HASH(704b5399c8f91c472b1826c74dee0a5a)                     */
+/* BINDTOOL_HEADER_FILE_HASH(423674352455f6357bd249e1f5221cb4)                     */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>
@@ -34,7 +34,7 @@ void bind_signal_field(py::module& m)
 
 
     py::class_<signal_field, gr::digital::packet_header_default,
-        std::shared_ptr<signal_field>>(m, "signal_field", D(signal_field))
+        std::shared_ptr<signal_field>>(m, "signal_field", D(signal_field), py::multiple_inheritance())
 
         .def(py::init(&signal_field::make),
            D(signal_field,make)
@@ -43,18 +43,6 @@ void bind_signal_field(py::module& m)
 
 
 
-
-        
-        .def("base",&signal_field::base,       
-            D(signal_field,base)
-        )
-
-
-        
-        .def("formatter",&signal_field::formatter,       
-            D(signal_field,formatter)
-        )
-
         ;