From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Thu, 16 Feb 2017 22:45:30 +0000 (-0800)
Subject: Drop support for Clang < 3.9
X-Git-Tag: v2017.03.06.00~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1d804f037c302280d3d89ac408056ea3cfe7989f;p=folly.git

Drop support for Clang < 3.9

Summary: [Folly] Drop support for Clang < 3.9.

Reviewed By: igorsugak

Differential Revision: D4567233

fbshipit-source-id: cd94c711f0390d249b6736ab292721a477022b02
---

diff --git a/folly/Range.h b/folly/Range.h
index eb53f937..d2077bdb 100644
--- a/folly/Range.h
+++ b/folly/Range.h
@@ -205,9 +205,7 @@ public:
   constexpr Range(Iter start, size_t size)
       : b_(start), e_(start + size) { }
 
-# if !__clang__ || __CLANG_PREREQ(3, 7) // Clang 3.6 crashes on this line
   /* implicit */ Range(std::nullptr_t) = delete;
-# endif
 
   template <class T = Iter, typename detail::IsCharPointer<T>::type = 0>
   constexpr /* implicit */ Range(Iter str)
diff --git a/folly/test/ExpectedTest.cpp b/folly/test/ExpectedTest.cpp
index d8291d0f..da2ede70 100644
--- a/folly/test/ExpectedTest.cpp
+++ b/folly/test/ExpectedTest.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <folly/Expected.h>
-#include <folly/Portability.h>
 #include <folly/portability/GTest.h>
 
 #include <algorithm>
@@ -453,7 +452,7 @@ TEST(Expected, MakeOptional) {
   EXPECT_EQ(**exIntPtr, 3);
 }
 
-#if __CLANG_PREREQ(3, 6)
+#if __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-move"
 #endif
@@ -468,7 +467,7 @@ TEST(Expected, SelfAssignment) {
   ASSERT_TRUE(b.hasValue() && b.value() == "23333333");
 }
 
-#if __CLANG_PREREQ(3, 6)
+#if __clang__
 #pragma clang diagnostic pop
 #endif
 
diff --git a/folly/test/OptionalTest.cpp b/folly/test/OptionalTest.cpp
index 3968040f..b7484dfa 100644
--- a/folly/test/OptionalTest.cpp
+++ b/folly/test/OptionalTest.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <folly/Optional.h>
-#include <folly/Portability.h>
 #include <folly/portability/GTest.h>
 
 #include <algorithm>
@@ -460,7 +459,7 @@ TEST(Optional, MakeOptional) {
   EXPECT_EQ(**optIntPtr, 3);
 }
 
-#if __CLANG_PREREQ(3, 6)
+#if __clang__
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wself-move"
 #endif
@@ -475,7 +474,7 @@ TEST(Optional, SelfAssignment) {
   ASSERT_TRUE(b.hasValue() && b.value() == 23333333);
 }
 
-#if __CLANG_PREREQ(3, 6)
+#if __clang__
 # pragma clang diagnostic pop
 #endif