Move OpenSSLPtrTypes.h from folly/io/async/ssl to folly/ssl

[folly.git] / folly / portability / BitsFunctexcept.cpp

diff --git a/folly/portability/BitsFunctexcept.cpp b/folly/portability/BitsFunctexcept.cpp
index 1a72b69bd06ad971359c7f39c85ab2b05ebcd129..97563f8d4ca0971dc6cd923d9aabbfa4ecd6db0a 100644 (file)
--- a/folly/portability/BitsFunctexcept.cpp
+++ b/folly/portability/BitsFunctexcept.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * 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.
@@ -16,28 +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
 
-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