From c3392a9fccc04129816057b1184c651171034376 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 17 Jun 2015 22:15:01 +0200
Subject: some CXXFLAGS housekeeping

More warnings are always better.

Git-Dch: Ignore
---
 apt-pkg/aptconfiguration.h | 2 +-
 apt-pkg/contrib/sptr.h     | 8 ++++++++
 apt-pkg/edsp.h             | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index 353843c3e..fbd9b02e6 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -122,7 +122,7 @@ namespace Configuration {							/*{{{*/
 	/** \return Return a comma-separated list of enabled build profile specifications */
 	std::string const getBuildProfilesString();
 									/*}}}*/
-};
+}
 									/*}}}*/
 }
 #endif
diff --git a/apt-pkg/contrib/sptr.h b/apt-pkg/contrib/sptr.h
index 9df0e44a7..e2e811b1d 100644
--- a/apt-pkg/contrib/sptr.h
+++ b/apt-pkg/contrib/sptr.h
@@ -60,7 +60,15 @@ class SPtrArray
    
    inline SPtrArray(T *Ptr) : Ptr(Ptr) {};
    inline SPtrArray() : Ptr(0) {};
+#if __GNUC__ >= 4
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+	// gcc warns about this, but we can do nothing here…
+#endif
    inline ~SPtrArray() {delete [] Ptr;};
+#if __GNUC__ >= 4
+	#pragma GCC diagnostic pop
+#endif
 };
 
 #endif
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 72b886a31..4f5f500a1 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -211,6 +211,6 @@ namespace EDSP								/*{{{*/
 	bool ResolveExternal(const char* const solver, pkgDepCache &Cache,
 				    bool const upgrade, bool const distUpgrade,
 				    bool const autoRemove, OpProgress *Progress = NULL);
-};
+}
 									/*}}}*/
 #endif
-- 
cgit v1.2.3