From 3975849d4447642d6c476d430b8842bfd9b7b5b9 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Sun, 17 Dec 2017 20:56:49 -0800 Subject: [PATCH] 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 --- folly/Assume.h | 17 ----------------- folly/Makefile.am | 1 - folly/Poly.h | 2 +- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 folly/Assume.h diff --git a/folly/Assume.h b/folly/Assume.h deleted file mode 100644 index 73b66a50..00000000 --- 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 // @shim diff --git a/folly/Makefile.am b/folly/Makefile.am index 46832090..6df61c3c 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -27,7 +27,6 @@ lib_LTLIBRARIES = \ follyincludedir = $(includedir)/folly nobase_follyinclude_HEADERS = \ - Assume.h \ AtomicBitSet.h \ AtomicHashArray.h \ AtomicHashArray-inl.h \ diff --git a/folly/Poly.h b/folly/Poly.h index 6acac682..5563f0a3 100644 --- a/folly/Poly.h +++ b/folly/Poly.h @@ -35,10 +35,10 @@ #include #include -#include #include #include #include +#include #if !defined(__cpp_inline_variables) #define FOLLY_INLINE_CONSTEXPR constexpr -- 2.34.1