From: Daniel Elstner <redacted>
Date: Mon, 2 Nov 2015 21:29:46 +0000 (+0100)
Subject: Suppress warnings from glibmm about deprecated auto_ptr
X-Git-Tag: pulseview-0.3.0~58
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8ada6ef1319fa11fd594a34853967c1f9688913b;p=pulseview.git

Suppress warnings from glibmm about deprecated auto_ptr

This fixes bug #654.
---

diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index bd858bbf..4854bd6c 100644
--- a/pv/binding/binding.hpp
+++ b/pv/binding/binding.hpp
@@ -21,7 +21,11 @@
 #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>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <vector>
 #include <memory>
diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index 123783ae..77eb9a6a 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -21,7 +21,11 @@
 #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>
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>
 #include <QString>