Assorted cleanups for folly/portability/BitsFunctexcept.h

Summary: [Folly] Assorted cleanups for `folly/portability/BitsFunctexcept.h`.

Reviewed By: Orvid, smeenai

Differential Revision: D4492264

fbshipit-source-id: 5e85ac2ad96ef84627cc5473ec0b16c4c9b5da26

diff --git a/folly/portability/BitsFunctexcept.cpp b/folly/portability/BitsFunctexcept.cpp
index a8bac63ef17f1f2f4f85c830555844dfec136d12..97563f8d4ca0971dc6cd923d9aabbfa4ecd6db0a 100644 (file)
--- a/folly/portability/BitsFunctexcept.cpp
+++ b/folly/portability/BitsFunctexcept.cpp
@@ -16,31 +16,36 @@
 
 #include <folly/portability/BitsFunctexcept.h>
 
-#if !FOLLY_HAVE_BITS_FUNCTEXCEPT_H
 #include <stdexcept>
 
+#if FOLLY_HAVE_BITS_FUNCTEXCEPT_H
+
+// for symmetry with the header; this section intentionally left blank
+
+#else
+
 FOLLY_NAMESPACE_STD_BEGIN
 
-#if (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 4000) && \
-    !defined(FOLLY_SKIP_LIBCPP_4000_THROW_BACKPORTS)
-void __throw_length_error(const char* msg) {
+#if _LIBCPP_VERSION < 4000 && !FOLLY_SKIP_LIBCPP_4000_THROW_BACKPORTS
+void __throw_length_error(char const* msg) {
   throw std::length_error(msg);
 }
 
-void __throw_logic_error(const char* msg) {
+void __throw_logic_error(char const* msg) {
   throw std::logic_error(msg);
 }
 
-void __throw_out_of_range(const char* msg) {
+void __throw_out_of_range(char const* msg) {
   throw std::out_of_range(msg);
 }
 #endif
 
-#ifdef _MSC_VER
+#if _CPPLIB_VER // msvc c++ std lib
 void __throw_bad_alloc() {
   throw std::bad_alloc();
 }
 #endif
 
 FOLLY_NAMESPACE_STD_END
+
 #endif

diff --git a/folly/portability/BitsFunctexcept.h b/folly/portability/BitsFunctexcept.h
index 7b44197bda7a45fcdb155d082ecb7ecbeb190115..ac04ff8555fde58adef7bf4aec47628ff635a881 100644 (file)
--- a/folly/portability/BitsFunctexcept.h
+++ b/folly/portability/BitsFunctexcept.h
@@ -16,25 +16,29 @@
 
 #pragma once
 
+#include <new>
+
+#include <folly/Portability.h>
 #include <folly/portability/Config.h>
 
 #if FOLLY_HAVE_BITS_FUNCTEXCEPT_H
+
 #include <bits/functexcept.h>
+
 #else
-#include <new> // Some platforms define __throw_bad_alloc() here.
-#include <folly/Portability.h>
+
 FOLLY_NAMESPACE_STD_BEGIN
 
-#if (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 4000) && \
-    !defined(FOLLY_SKIP_LIBCPP_4000_THROW_BACKPORTS)
-[[noreturn]] void __throw_length_error(const char* msg);
-[[noreturn]] void __throw_logic_error(const char* msg);
-[[noreturn]] void __throw_out_of_range(const char* msg);
+#if _LIBCPP_VERSION < 4000 && !FOLLY_SKIP_LIBCPP_4000_THROW_BACKPORTS
+[[noreturn]] void __throw_length_error(char const* msg); // @nolint
+[[noreturn]] void __throw_logic_error(char const* msg);
+[[noreturn]] void __throw_out_of_range(char const* msg);
 #endif
 
-#ifdef _MSC_VER
+#if _CPPLIB_VER // msvc c++ std lib
 [[noreturn]] void __throw_bad_alloc();
 #endif
 
 FOLLY_NAMESPACE_STD_END
+
 #endif