]> sigrok.org Git - pulseview.git/commitdiff
Suppress warnings from glibmm about deprecated auto_ptr
authorDaniel Elstner <redacted>
Mon, 2 Nov 2015 21:29:46 +0000 (22:29 +0100)
committerUwe Hermann <redacted>
Tue, 3 Nov 2015 20:25:27 +0000 (21:25 +0100)
This fixes bug #654.

pv/binding/binding.hpp
pv/prop/property.hpp

index bd858bbf27626ee225f362e919d400fb13ab2404..4854bd6c81635e3c3ce824d56656d6a6a7d02978 100644 (file)
 #ifndef PULSEVIEW_PV_BINDING_BINDING_HPP
 #define PULSEVIEW_PV_BINDING_BINDING_HPP
 
 #ifndef PULSEVIEW_PV_BINDING_BINDING_HPP
 #define PULSEVIEW_PV_BINDING_BINDING_HPP
 
+#include <glib.h>
+// Suppress warnings due to use of deprecated std::auto_ptr<> by glibmm.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
 #include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <vector>
 #include <memory>
 
 #include <vector>
 #include <memory>
index 123783ae0b4403729964d30108e3771eb9561450..77eb9a6a73ec61f36f828775e22fbd3cf1b501d1 100644 (file)
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
 #define PULSEVIEW_PV_PROP_PROPERTY_HPP
 
 #ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
 #define PULSEVIEW_PV_PROP_PROPERTY_HPP
 
+#include <glib.h>
+// Suppress warnings due to use of deprecated std::auto_ptr<> by glibmm.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
 #include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>
 #include <QString>
 
 #include <functional>
 #include <QString>