From 32237deddc7e5e06419e2bf310a9746b60914a21 Mon Sep 17 00:00:00 2001
From: jzmaddock <jzmaddock@gmail.com>
Date: Wed, 8 Oct 2014 13:37:18 +0100
Subject: [PATCH] Reorganize clang config to avoid macro redefinitions and fix
 GCC-4.8, 4.9, and 5.0 detection.

---
 include/boost/config/stdlib/libstdcpp3.hpp | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/include/boost/config/stdlib/libstdcpp3.hpp b/include/boost/config/stdlib/libstdcpp3.hpp
index 4e4946ea..5bea8d35 100644
--- a/include/boost/config/stdlib/libstdcpp3.hpp
+++ b/include/boost/config/stdlib/libstdcpp3.hpp
@@ -121,20 +121,22 @@
 //
 #ifdef __clang__
 
-#if __has_include(<array>)
-#  define BOOST_LIBSTDCXX_VERSION 40300
-#endif
-#if __has_include(<ratio>)
-#  define BOOST_LIBSTDCXX_VERSION 40400
-#endif
-#if __has_include(<future>)
-#  define BOOST_LIBSTDCXX_VERSION 40500
-#endif
-#if __has_include(<typeindex>)
-#  define BOOST_LIBSTDCXX_VERSION 40600
-#endif
-#if __has_include(<chrono>)
+#if __has_include(<experimental/any>)
+#  define BOOST_LIBSTDCXX_VERSION 50000
+#elif __has_include(<shared_mutex>)
+#  define BOOST_LIBSTDCXX_VERSION 40900
+#elif __has_include(<ext/cmath>)
+#  define BOOST_LIBSTDCXX_VERSION 40800
+#elif __has_include(chrono)
 #  define BOOST_LIBSTDCXX_VERSION 40700
+#elif __has_include(typeindex)
+#  define BOOST_LIBSTDCXX_VERSION 40600
+#elif __has_include(future)
+#  define BOOST_LIBSTDCXX_VERSION 40500
+#elif  __has_include(ratio)
+#  define BOOST_LIBSTDCXX_VERSION 40400
+#elif __has_include(array)
+#  define BOOST_LIBSTDCXX_VERSION 40300
 #endif
 //
 //  GCC 4.8 and 9 add working versions of <atomic> and <regex> respectively.