Don't use deprecated headers.

[pulseview.git] / pv / prop / property.hpp

diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index dd6d25bad37460d4e1fe9bac6992366a42933907..6a4dd9ab2723156171cd04a23283b5f3ffd3434f 100644 (file)
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -14,14 +14,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_PROP_PROPERTY_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_HPP
+#define PULSEVIEW_PV_PROP_PROPERTY_HPP
 
-#include <glibmm-2.4/glibmm.h>
+#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>
@@ -63,4 +66,4 @@ private:
 } // prop
 } // pv
 
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_HPP