diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp
index 5b413163b..17dc08494 100644
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@@ -51,6 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
 #ifdef __GNUC__
+#pragma GCC diagnostic push
 // this is to suppress the warnings for using std::auto_ptr
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
diff --git a/include/libtorrent/aux_/disable_warnings_pop.hpp b/include/libtorrent/aux_/disable_warnings_pop.hpp
index 57f439859..8ffbe4f92 100644
--- a/include/libtorrent/aux_/disable_warnings_pop.hpp
+++ b/include/libtorrent/aux_/disable_warnings_pop.hpp
@@ -30,11 +30,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+