X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2Fportability%2FBitsFunctexcept.cpp;h=97563f8d4ca0971dc6cd923d9aabbfa4ecd6db0a;hb=6b1a43fd0712c15cb98f134bc2d8c89713b24513;hp=1a52e96f44f3377c88e3eaa41df0fcbbc13a7a93;hpb=dc938550557e34825c30056f916fd8eb81787076;p=folly.git

diff --git a/folly/portability/BitsFunctexcept.cpp b/folly/portability/BitsFunctexcept.cpp
index 1a52e96f..97563f8d 100644
--- 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 < 3900) && \
-    !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