From 8d8e24905d2feffc90fc99d17fcb7d4507be5620 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Fri, 16 Oct 2015 23:17:29 -0700
Subject: [PATCH] Boost compilation fixes. These patches are better than those
 we used previously.

---
 3party/boost/boost/core/demangle.hpp         | 13 ++++++++++++-
 3party/boost/boost/gil/channel_algorithm.hpp |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/3party/boost/boost/core/demangle.hpp b/3party/boost/boost/core/demangle.hpp
index eebd0ce0f1..52b4514b19 100644
--- a/3party/boost/boost/core/demangle.hpp
+++ b/3party/boost/boost/core/demangle.hpp
@@ -31,6 +31,14 @@
 # include <cstddef>
 #endif
 
+// Android compilation error workaround: gabi++ does not define __cxa_demangle()
+// 3party/boost/boost/core/demangle.hpp:75:17: error: no member named '__cxa_demangle' in namespace '__cxxabiv1'
+//    return abi::__cxa_demangle( name, NULL, &size, &status );
+//           ~~~~~^
+#ifdef __GABIXX_CXXABI_H__
+# undef BOOST_CORE_HAS_CXXABI_H
+#endif
+
 namespace boost
 {
 
@@ -116,6 +124,9 @@ inline std::string demangle( char const * name )
 
 } // namespace boost
 
-#undef BOOST_CORE_HAS_CXXABI_H
+// Second part of work-around for Android, see above.
+#ifdef BOOST_CORE_HAS_CXXABI_H
+# undef BOOST_CORE_HAS_CXXABI_H
+#endif
 
 #endif // #ifndef BOOST_CORE_DEMANGLE_HPP_INCLUDED
diff --git a/3party/boost/boost/gil/channel_algorithm.hpp b/3party/boost/boost/gil/channel_algorithm.hpp
index 1361219a33..5ce7ff2d83 100644
--- a/3party/boost/boost/gil/channel_algorithm.hpp
+++ b/3party/boost/boost/gil/channel_algorithm.hpp
@@ -51,7 +51,7 @@ template <typename SrcChannelV, typename DstChannelV, bool SrcLessThanDst, bool
 
 
 template <typename UnsignedIntegralChannel>
-struct unsigned_integral_max_value : public mpl::integral_c<UnsignedIntegralChannel,-1> {};
+struct unsigned_integral_max_value : public mpl::integral_c<UnsignedIntegralChannel,integer_traits<UnsignedIntegralChannel>::const_max> {};
 
 template <>
 struct unsigned_integral_max_value<uint8_t> : public mpl::integral_c<uint32_t,0xFF> {};