From d7116d686727e2c6ac99612e7ff3ecf598f91a9f Mon Sep 17 00:00:00 2001
From: Edward Hennis <ximinez@users.noreply.github.com>
Date: Thu, 30 Oct 2014 12:36:13 -0400
Subject: [PATCH] Enable std::array overloads for boost::asio on clang: *
 Remove Boost config option from beast config. * Define from compiler, or let
 Boost figure out itself.

---
 SConstruct               | 1 +
 src/beast/beast/Config.h | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index e5cae3daa..31611e087 100644
--- a/SConstruct
+++ b/SConstruct
@@ -265,6 +265,7 @@ def config_env(toolchain, variant, env):
 
         if toolchain == 'clang':
             env.Append(CCFLAGS=['-Wno-redeclared-class-member'])
+            env.Append(CPPDEFINES=['BOOST_ASIO_HAS_STD_ARRAY'])
 
         env.Append(CXXFLAGS=[
             '-frtti',
diff --git a/src/beast/beast/Config.h b/src/beast/beast/Config.h
index 0170f92ec..8f10fedf0 100644
--- a/src/beast/beast/Config.h
+++ b/src/beast/beast/Config.h
@@ -26,9 +26,6 @@
 
 // VFALCO NOTE this is analogous to <boost/config.hpp>
 
-// Assert to boost that we always have std::array support
-#define BOOST_ASIO_HAS_STD_ARRAY 1
-
 #if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG)
 #include <beast/config/SelectCompilerConfig.h>
 #endif