C++: Fix shared pointer handling for Device base class.

[libsigrok.git] / bindings / cxx / include / libsigrok / libsigrok.hpp

diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp
index 546a4502e7fb6fe945c5c2070e01bbe24c13c94a..6595802e9c3e8d121043203566a50a6543be714c 100644 (file)
--- a/bindings/cxx/include/libsigrok/libsigrok.hpp
+++ b/bindings/cxx/include/libsigrok/libsigrok.hpp
@@ -289,9 +289,7 @@ protected:
 };
 
 /** A generic device, either hardware or virtual */
-class SR_API Device :
-       public Configurable,
-       public StructureWrapper<Context, struct sr_dev_inst>
+class SR_API Device : public Configurable
 {
 public:
        /** Description identifying this device. */
@@ -313,7 +311,9 @@ public:
 protected:
        Device(struct sr_dev_inst *structure);
        ~Device();
+       virtual shared_ptr<Device> get_shared_from_this() = 0;
        shared_ptr<Channel> get_channel(struct sr_channel *ptr);
+       struct sr_dev_inst *structure;
        map<struct sr_channel *, Channel *> channels;
        map<string, ChannelGroup *> channel_groups;
        /** Deleter needed to allow shared_ptr use with protected destructor. */
@@ -331,7 +331,9 @@ protected:
 };
 
 /** A real hardware device, connected via a driver */
-class SR_API HardwareDevice : public Device
+class SR_API HardwareDevice :
+       public StructureWrapper<Context, struct sr_dev_inst>,
+       public Device
 {
 public:
        /** Driver providing this device. */
@@ -339,6 +341,7 @@ public:
 protected:
        HardwareDevice(Driver *driver, struct sr_dev_inst *structure);
        ~HardwareDevice();
+       shared_ptr<Device> get_shared_from_this();
        Driver *driver;
        friend class Driver;
        friend class ChannelGroup;
@@ -762,6 +765,7 @@ public:
 protected:
        Input(shared_ptr<Context> context, const struct sr_input *structure);
        ~Input();
+       shared_ptr<Device> get_shared_from_this();
        const struct sr_input *structure;
        shared_ptr<Context> context;
        InputDevice *device;
@@ -777,11 +781,14 @@ protected:
 };
 
 /** A virtual device associated with an input */
-class SR_API InputDevice : public Device
+class SR_API InputDevice :
+       public StructureWrapper<Input, struct sr_dev_inst>,
+       public Device
 {
 protected:
        InputDevice(shared_ptr<Input> input, struct sr_dev_inst *sdi);
        ~InputDevice();
+       shared_ptr<Device> get_shared_from_this();
        shared_ptr<Input> input;
        /** Deleter needed to allow shared_ptr use with protected destructor. */
        class Deleter
@@ -820,6 +827,7 @@ protected:
                void operator()(Option *option) { delete option; }
        };
        friend class Deleter;
+       friend class InputFormat;
        friend class OutputFormat;
 };