Remove the folly/Assume.h shim v2017.12.18.00
authorChristopher Dykes <cdykes@fb.com>
Mon, 18 Dec 2017 04:56:49 +0000 (20:56 -0800)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Mon, 18 Dec 2017 05:05:13 +0000 (21:05 -0800)
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

folly/Assume.h [deleted file]
folly/Makefile.am
folly/Poly.h

diff --git a/folly/Assume.h b/folly/Assume.h
deleted file mode 100644 (file)
index 73b66a5..0000000
+++ /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
index 4683209..6df61c3 100644 (file)
@@ -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 \
index 6acac68..5563f0a 100644 (file)
 #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