diff --git a/3party/opening_hours/osm_time_range.cpp b/3party/opening_hours/osm_time_range.cpp
index 633b487e98..40428e3ca3 100644
--- a/3party/opening_hours/osm_time_range.cpp
+++ b/3party/opening_hours/osm_time_range.cpp
@@ -17,12 +17,16 @@
 #include <boost/spirit/include/phoenix_bind.hpp>
 #include <boost/fusion/adapted/struct/adapt_struct.hpp>
 
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/date_time/gregorian/gregorian.hpp>
 #pragma clang diagnostic pop
-
+#else
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#endif
 
 
 namespace osmoh
diff --git a/3party/opening_hours/osm_time_range_tests.cpp b/3party/opening_hours/osm_time_range_tests.cpp
index cd2811bc62..244eb1c443 100644
--- a/3party/opening_hours/osm_time_range_tests.cpp
+++ b/3party/opening_hours/osm_time_range_tests.cpp
@@ -5,13 +5,18 @@
 #include <map>
 #include <locale>
 
+#define BOOST_TEST_MODULE OpeningHours
+
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#define BOOST_TEST_MODULE OpeningHours
 #include <boost/test/included/unit_test.hpp>
-#include <boost/spirit/include/qi.hpp>
 #pragma clang diagnostic pop
+#else
+#include <boost/test/included/unit_test.hpp>
+#endif
 
+#include <boost/spirit/include/qi.hpp>
 
 template <typename Char, typename Parser>
 bool test(Char const* in, Parser const& p, bool full_match = true)