C++: Suppress deprecation warnings from glibmm

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

diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
index f7b2c46864b2007694d33f15667a30770f1eda2b..b60d613257ee5bb3341c7077decee3339c36ac1d 100644 (file)
--- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
+++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
@@ -71,7 +71,12 @@ raised, which provides access to the error code and description.
 #define LIBSIGROKCXX_HPP
 
 #include <libsigrok/libsigrok.h>
+
+/* Suppress warnings due to glibmm's use of std::auto_ptr<> in a public
+ * header file. To be removed once glibmm is fixed. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <stdexcept>
 #include <memory>
@@ -269,15 +274,15 @@ public:
        shared_ptr<Packet> create_header_packet(Glib::TimeVal start_time);
        /** Create a meta packet. */
        shared_ptr<Packet> create_meta_packet(
-               const map<const ConfigKey *, Glib::VariantBase> &config);
+               map<const ConfigKey *, Glib::VariantBase> config);
        /** Create a logic packet. */
        shared_ptr<Packet> create_logic_packet(
                void *data_pointer, size_t data_length, unsigned int unit_size);
        /** Create an analog packet. */
        shared_ptr<Packet> create_analog_packet(
-               const vector<shared_ptr<Channel> > &channels,
+               vector<shared_ptr<Channel> > channels,
                float *data_pointer, unsigned int num_samples, const Quantity *mq,
-               const Unit *unit, const vector<const QuantityFlag *> &mqflags);
+               const Unit *unit, vector<const QuantityFlag *> mqflags);
        /** Load a saved session.
         * @param filename File name string. */
        shared_ptr<Session> load_session(string filename);
@@ -326,7 +331,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<Capability> > config_keys(const ConfigKey *key);
+       map<const ConfigKey *, set<enum 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:
@@ -352,8 +357,8 @@ public:
        string long_name() const;
        /** Scan for devices and return a list of devices found.
         * @param options Mapping of (ConfigKey, value) pairs. */
-       vector<shared_ptr<HardwareDevice> > scan(const map<const ConfigKey *, Glib::VariantBase>
-                       &options = map<const ConfigKey *, Glib::VariantBase>());
+       vector<shared_ptr<HardwareDevice> > scan(map<const ConfigKey *, Glib::VariantBase>
+                       options = map<const ConfigKey *, Glib::VariantBase>());
 private:
        struct sr_dev_driver *_structure;
        bool _initialized;
@@ -798,8 +803,8 @@ public:
        map<string, shared_ptr<Option> > options();
        /** Create an input using this input format.
         * @param options Mapping of (option name, value) pairs. */
-       shared_ptr<Input> create_input(const map<string, Glib::VariantBase>
-                       &options = map<string, Glib::VariantBase>());
+       shared_ptr<Input> create_input(map<string, Glib::VariantBase>
+                       options = map<string, Glib::VariantBase>());
 private:
        explicit InputFormat(const struct sr_input_module *structure);
        ~InputFormat();
@@ -893,14 +898,14 @@ public:
         * @param device Device to output for.
         * @param options Mapping of (option name, value) pairs. */
        shared_ptr<Output> create_output(shared_ptr<Device> device,
-               const map<string, Glib::VariantBase> &options = map<string, Glib::VariantBase>());
+               map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
        /** Create an output using this format.
         * @param filename Name of destination file.
         * @param device Device to output for.
         * @param options Mapping of (option name, value) pairs. */
        shared_ptr<Output> create_output(string filename,
                shared_ptr<Device> device,
-               const map<string, Glib::VariantBase> &options = map<string, Glib::VariantBase>());
+               map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
        /**
         * Checks whether a given flag is set.
         * @param flag Flag to check
@@ -929,9 +934,9 @@ public:
 private:
        Output(shared_ptr<OutputFormat> format, shared_ptr<Device> device);
        Output(shared_ptr<OutputFormat> format,
-               shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
+               shared_ptr<Device> device, map<string, Glib::VariantBase> options);
        Output(string filename, shared_ptr<OutputFormat> format,
-               shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
+               shared_ptr<Device> device, map<string, Glib::VariantBase> options);
        ~Output();
 
        const struct sr_output *_structure;
@@ -986,8 +991,8 @@ private:
        const string _name;
 };
 
-#include <libsigrokcxx/enums.hpp>
-
 }
 
+#include <libsigrokcxx/enums.hpp>
+
 #endif