X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Finclude%2Flibsigrokcxx%2Flibsigrokcxx.hpp;h=da2a286e05d79db7eff2e234067274ee6a41a58b;hb=12f2f640cbe9167ad386a2d9069ec882d70cda5b;hp=b60d613257ee5bb3341c7077decee3339c36ac1d;hpb=cea8c3124f982606f4b466374c568d0f723b8197;p=libsigrok.git

diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index b60d6132..da2a286e 100644
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -98,6 +98,7 @@ class SR_API HardwareDevice;
 class SR_API Channel;
 class SR_API Session;
 class SR_API ConfigKey;
+class SR_API Capability;
 class SR_API InputFormat;
 class SR_API OutputFormat;
 class SR_API OutputFlag;
@@ -307,13 +308,7 @@ private:
 	~Context();
 	friend class Session;
 	friend class Driver;
-	friend class std::default_delete<Context>;
-};
-
-enum Capability {
-	GET = SR_CONF_GET,
-	SET = SR_CONF_SET,
-	LIST = SR_CONF_LIST
+	friend struct std::default_delete<Context>;
 };
 
 /** An object that can be configured. */
@@ -331,7 +326,7 @@ public:
 	 * @param key ConfigKey to enumerate values for. */
 	Glib::VariantContainerBase config_list(const ConfigKey *key) const;
 	/** Enumerate available keys, according to a given index key. */
-	map<const ConfigKey *, set<enum Capability> > config_keys(const ConfigKey *key);
+	map<const ConfigKey *, set<const Capability *> > config_keys(const ConfigKey *key);
 	/** Check for a key in the list from a given index key. */
 	bool config_check(const ConfigKey *key, const ConfigKey *index_key) const;
 protected:
@@ -368,7 +363,7 @@ private:
 	friend class Context;
 	friend class HardwareDevice;
 	friend class ChannelGroup;
-	friend class std::default_delete<Driver>;
+	friend struct std::default_delete<Driver>;
 };
 
 /** A generic device, either hardware or virtual */
@@ -409,7 +404,7 @@ private:
 	friend class ChannelGroup;
 	friend class Output;
 	friend class Analog;
-	friend class std::default_delete<Device>;
+	friend struct std::default_delete<Device>;
 };
 
 /** A real hardware device, connected via a driver */
@@ -428,7 +423,7 @@ private:
 
 	friend class Driver;
 	friend class ChannelGroup;
-	friend class std::default_delete<HardwareDevice>;
+	friend struct std::default_delete<HardwareDevice>;
 };
 
 /** A virtual device, created by the user */
@@ -445,7 +440,7 @@ private:
 	shared_ptr<Device> get_shared_from_this();
 
 	friend class Context;
-	friend class std::default_delete<UserDevice>;
+	friend struct std::default_delete<UserDevice>;
 };
 
 /** A channel on a device */
@@ -478,7 +473,7 @@ private:
 	friend class Session;
 	friend class TriggerStage;
 	friend class Context;
-	friend class std::default_delete<Channel>;
+	friend struct std::default_delete<Channel>;
 };
 
 /** A group of channels on a device, which share some configuration */
@@ -496,7 +491,7 @@ private:
 	~ChannelGroup();
 	vector<Channel *> _channels;
 	friend class Device;
-	friend class std::default_delete<ChannelGroup>;
+	friend struct std::default_delete<ChannelGroup>;
 };
 
 /** A trigger configuration */
@@ -517,7 +512,7 @@ private:
 	vector<unique_ptr<TriggerStage> > _stages;
 	friend class Context;
 	friend class Session;
-	friend class std::default_delete<Trigger>;
+	friend struct std::default_delete<Trigger>;
 };
 
 /** A stage in a trigger configuration */
@@ -544,7 +539,7 @@ private:
 	explicit TriggerStage(struct sr_trigger_stage *structure);
 	~TriggerStage();
 	friend class Trigger;
-	friend class std::default_delete<TriggerStage>;
+	friend struct std::default_delete<TriggerStage>;
 };
 
 /** A match condition in a trigger configuration  */
@@ -564,7 +559,7 @@ private:
 	struct sr_trigger_match *_structure;
 	shared_ptr<Channel> _channel;
 	friend class TriggerStage;
-	friend class std::default_delete<TriggerMatch>;
+	friend struct std::default_delete<TriggerMatch>;
 };
 
 /** Type of session stopped callback */
@@ -599,7 +594,7 @@ private:
 	shared_ptr<Device> get_shared_from_this();
 
 	friend class Session;
-	friend class std::default_delete<SessionDevice>;
+	friend struct std::default_delete<SessionDevice>;
 };
 
 /** A sigrok session */
@@ -654,7 +649,7 @@ private:
 	friend class Context;
 	friend class DatafeedCallbackData;
 	friend class SessionDevice;
-	friend class std::default_delete<Session>;
+	friend struct std::default_delete<Session>;
 };
 
 /** A packet on the session datafeed */
@@ -681,7 +676,7 @@ private:
 	friend class Logic;
 	friend class Analog;
 	friend class Context;
-	friend class std::default_delete<Packet>;
+	friend struct std::default_delete<Packet>;
 };
 
 /** Abstract base class for datafeed packet payloads */
@@ -695,7 +690,7 @@ private:
 
 	friend class Packet;
 	friend class Output;
-	friend class std::default_delete<PacketPayload>;
+	friend struct std::default_delete<PacketPayload>;
 };
 
 /** Payload of a datafeed header packet */
@@ -813,7 +808,7 @@ private:
 
 	friend class Context;
 	friend class InputDevice;
-	friend class std::default_delete<InputFormat>;
+	friend struct std::default_delete<InputFormat>;
 };
 
 /** An input instance (an input format applied to a file or stream) */
@@ -837,7 +832,7 @@ private:
 
 	friend class Context;
 	friend class InputFormat;
-	friend class std::default_delete<Input>;
+	friend struct std::default_delete<Input>;
 };
 
 /** A virtual device associated with an input */
@@ -851,7 +846,7 @@ private:
 	shared_ptr<Device> get_shared_from_this();
 	shared_ptr<Input> _input;
 	friend class Input;
-	friend class std::default_delete<InputDevice>;
+	friend struct std::default_delete<InputDevice>;
 };
 
 /** An option used by an output format */
@@ -877,7 +872,7 @@ private:
 
 	friend class InputFormat;
 	friend class OutputFormat;
-	friend class std::default_delete<Option>;
+	friend struct std::default_delete<Option>;
 };
 
 /** An output format supported by the library */
@@ -921,7 +916,7 @@ private:
 
 	friend class Context;
 	friend class Output;
-	friend class std::default_delete<OutputFormat>;
+	friend struct std::default_delete<OutputFormat>;
 };
 
 /** An output instance (an output format applied to a device) */
@@ -945,7 +940,7 @@ private:
 	const map<string, Glib::VariantBase> _options;
 
 	friend class OutputFormat;
-	friend class std::default_delete<Output>;
+	friend struct std::default_delete<Output>;
 };
 
 /** Base class for objects which wrap an enumeration value from libsigrok */