Silence GTK deprecation warnings in champlain-gtk

Also remove unused pragma

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index a692944..9d39104 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -24,7 +24,10 @@
 #include <cstring>
 
 #include <cairo.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <champlain-gtk/champlain-gtk.h>
+#pragma GCC diagnostic pop
 #include <champlain/champlain.h>
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter/clutter.h>

diff --git a/src/image-load-cr3.cc b/src/image-load-cr3.cc
index 926bff4..3b0dcb7 100644 (file)
--- a/src/image-load-cr3.cc
+++ b/src/image-load-cr3.cc
@@ -18,9 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/** This is a Will Not Fix */
-#pragma GCC diagnostic ignored "-Wclobbered"
-
 #include "image-load-cr3.h"
 
 #include <cstring>