Remove the folly/Assume.h shim

Summary: The shim existed so that hhvm-third-party could be updated, and it has been, so it's time to remove the shim.

Reviewed By: yfeldblum

Differential Revision: D6590439

fbshipit-source-id: 3e1b039c1df6cf1e74102f7b7b26aa90fae31ec0

diff --git a/folly/Assume.h b/folly/Assume.h
deleted file mode 100644 (file)
index 73b66a5..0000000
--- a/folly/Assume.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <folly/lang/Assume.h> // @shim

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 468320904fdeafa457da974bdbc1494e11071178..6df61c3c6a3c2ed362394de1b8182b1123f7f7e3 100644 (file)
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -27,7 +27,6 @@ lib_LTLIBRARIES = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \

-       Assume.h \

        AtomicBitSet.h \
        AtomicHashArray.h \
        AtomicHashArray-inl.h \
        AtomicBitSet.h \
        AtomicHashArray.h \
        AtomicHashArray-inl.h \

diff --git a/folly/Poly.h b/folly/Poly.h
index 6acac6826461223af938f2432d38bddc368122e9..5563f0a3f8a56a2813b83d2cd76a9b6ff388b81f 100644 (file)
--- a/folly/Poly.h
+++ b/folly/Poly.h
@@ -35,10 +35,10 @@
 #include <typeinfo>
 #include <utility>
 
 #include <typeinfo>
 #include <utility>
 

-#include <folly/Assume.h>

 #include <folly/CppAttributes.h>
 #include <folly/Traits.h>
 #include <folly/detail/TypeList.h>
 #include <folly/CppAttributes.h>
 #include <folly/Traits.h>
 #include <folly/detail/TypeList.h>

+#include <folly/lang/Assume.h>

 
 #if !defined(__cpp_inline_variables)
 #define FOLLY_INLINE_CONSTEXPR constexpr
 
 #if !defined(__cpp_inline_variables)
 #define FOLLY_INLINE_CONSTEXPR constexpr