diff --git a/folly/Makefile.am b/folly/Makefile.am index bbbc91021b2f3bcbaef14b2ab39ea3e89fc37fb1..12799b2afbbe4809f838d8e042de2d7b704ebddc 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -364,7 +364,6 @@ nobase_follyinclude_HEADERS = \ Portability.h \ portability/Asm.h \ portability/Atomic.h \ - portability/BitsFunctexcept.h \ portability/Builtins.h \ portability/Config.h \ portability/Constexpr.h \ @@ -497,7 +496,6 @@ libfollybase_la_SOURCES = \ Format.cpp \ FormatArg.cpp \ memory/MallctlHelper.cpp \ - portability/BitsFunctexcept.cpp \ String.cpp \ Unicode.cpp diff --git a/folly/portability/BitsFunctexcept.cpp b/folly/portability/BitsFunctexcept.cpp deleted file mode 100644 index 787f8da8def5082d6683940d9419db934e1b364a..0000000000000000000000000000000000000000 --- a/folly/portability/BitsFunctexcept.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2013-present 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/portability/BitsFunctexcept.h> - -#include <stdexcept> - -#if FOLLY_HAVE_BITS_FUNCTEXCEPT_H - -// for symmetry with the header; this section intentionally left blank - -#else - -namespace std { - -#if _LIBCPP_VERSION < 4000 -void __throw_length_error(char const* msg) { - throw std::length_error(msg); -} - -void __throw_logic_error(char const* msg) { - throw std::logic_error(msg); -} - -void __throw_out_of_range(char const* msg) { - throw std::out_of_range(msg); -} -#endif - -#if _CPPLIB_VER // msvc c++ std lib -void __throw_bad_alloc() { - throw std::bad_alloc(); -} -#endif -} - -#endif diff --git a/folly/portability/BitsFunctexcept.h b/folly/portability/BitsFunctexcept.h deleted file mode 100644 index 188c41cbbcb015f4c752e29391cbb71ddbf44d40..0000000000000000000000000000000000000000 --- a/folly/portability/BitsFunctexcept.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2013-present 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. - */ - -#pragma once - -#include <new> - -#include <folly/Portability.h> -#include <folly/portability/Config.h> - -#if FOLLY_HAVE_BITS_FUNCTEXCEPT_H - -#include <bits/functexcept.h> - -#else - -namespace std { - -#if _LIBCPP_VERSION < 4000 -[[noreturn]] void __throw_length_error(char const* msg); -[[noreturn]] void __throw_logic_error(char const* msg); -[[noreturn]] void __throw_out_of_range(char const* msg); -#endif - -#if _CPPLIB_VER // msvc c++ std lib -[[noreturn]] void __throw_bad_alloc(); -#endif -} - -#endif