projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manpage: Document the new 'b' keyboard shortcut.
[pulseview.git]
/
pv
/
prop
/
property.hpp
diff --git
a/pv/prop/property.hpp
b/pv/prop/property.hpp
index dd6d25bad37460d4e1fe9bac6992366a42933907..77eb9a6a73ec61f36f828775e22fbd3cf1b501d1 100644
(file)
--- a/
pv/prop/property.hpp
+++ b/
pv/prop/property.hpp
@@
-18,10
+18,14
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_PROP_PROPERTY_H
-#define PULSEVIEW_PV_PROP_PROPERTY_H
+#ifndef PULSEVIEW_PV_PROP_PROPERTY_H
PP
+#define PULSEVIEW_PV_PROP_PROPERTY_H
PP
-#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>
#include <functional>
#include <QString>
@@
-63,4
+67,4
@@
private:
} // prop
} // pv
} // prop
} // pv
-#endif // PULSEVIEW_PV_PROP_PROPERTY_H
+#endif // PULSEVIEW_PV_PROP_PROPERTY_H
PP