Set version to 0.23.0

Refactor beast::asio:
* New tools for completion handlers: - wrap_handler provides composed io_service execution guarantees. - bind_handler rebinds arguments to handlers. - shared_handler type-erases any completion handler. - buffer_sequence type-erases templated BufferSequences - abstract_socket replaces Socket - socket_wrapper replaces SocketWrapper - beast::asio placeholders to work with std::bind * Removed obsolete classes and functions - AbstractHandler - ComposedAsyncOperation - SharedFunction - SharedHandler - SharedHandlerAllocator - SharedHandlerPtr - SharedHandlerType - SocketBase - SocketWrapperStrand - wrapHandler * Refactored classes to use new tools - abstract_socket - socket_wrapper - HandshakeDetector - HttpClientType * Miscellanous tidying - socket classes moved to beast::asio namespace - beast asio files provide their own namespace declaration. - Fix IsCallPossible conflicting template parameter name - Use <boost/get_pointer.hpp> for C++11 compatibility. - Remove extraneous include path from build environment.
2025-11-15 08:35:51 +00:00 · 2014-03-14 13:01:23 -07:00 · 2014-03-14 08:03:48 -07:00 · 2014-03-14 07:57:20 -07:00 · 2014-03-14 07:57:20 -07:00 · 2014-03-14 07:57:20 -07:00
1322 changed files with 119164 additions and 55820 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,50 @@
 language: cpp
 compiler:
+  - clang
  - gcc
 before_install:
  - sudo apt-get update -qq
-  - sudo apt-get install -qq libboost1.48-all-dev protobuf-compiler libprotobuf-dev libssl-dev exuberant-ctags
-script: scons && npm install && npm test
+  - sudo apt-get install -qq python-software-properties
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo add-apt-repository -y ppa:boost-latest/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq g++-4.8
+  - sudo apt-get install -qq libboost1.55-all-dev 
+  # We want debug symbols for boost as we install gdb later
+  - sudo apt-get install -qq libboost1.55-dbg
+  - sudo apt-get install -qq mlocate
+  - sudo updatedb
+  - sudo locate libboost | grep /lib | grep -e ".a$"
+  - sudo apt-get install -qq protobuf-compiler libprotobuf-dev libssl-dev exuberant-ctags
+  # We need gcc >= 4.8 for some c++11 features
+  - sudo apt-get install -qq gcc-4.8
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 40 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
+  - sudo update-alternatives --set gcc /usr/bin/gcc-4.8
+  # Stuff is gold. Nuff said ;)
+  - sudo apt-get -y install binutils-gold
+  # We can get a backtrace if the guy crashes
+  - sudo apt-get -y install gdb
+  # What versions are we ACTUALLY running?
+  - g++ -v
+  - clang -v
+
+script:
+  # Set so any failing command will abort the build
+  - set -e
+  # If only we could do -j12 ;)
+  - scons 
+  # See what we've actually built
+  - ldd ./build/rippled
+  # Run unittests (under gdb)
+  - | # create gdb script
+    echo "set env MALLOC_CHECK_=3" > script.gdb 
+    echo "run" >> script.gdb
+    echo "backtrace full" >> script.gdb 
+    # gdb --help
+  - cat script.gdb | gdb --ex 'set print thread-events off' --return-child-result --args ./build/rippled --unittest 
+  # Run integration tests
+  - npm install
+  - npm test
 notifications:
  email:
    false
--- a/Builds/QtCreator/rippled.pro
+++ b/Builds/QtCreator/rippled.pro
@@ -45,7 +45,7 @@ linux-g++:QMAKE_CXXFLAGS += \
    -pthread

 INCLUDEPATH += \
-    "../../src" \
+    "../../src/BeastConfig/" \
    "../../src/leveldb/" \
    "../../src/leveldb/port" \
    "../../src/leveldb/include" \
@@ -65,13 +65,13 @@ UI_HEADERS_DIR += ../../src/ripple_basics
 SOURCES += \
    ../../src/ripple/beast/ripple_beast.cpp \
    ../../src/ripple/beast/ripple_beastc.c \
+    ../../src/ripple/common/ripple_common.cpp \
    ../../src/ripple/http/ripple_http.cpp \
    ../../src/ripple/json/ripple_json.cpp \
    ../../src/ripple/peerfinder/ripple_peerfinder.cpp \
+    ../../src/ripple/radmap/ripple_radmap.cpp \
    ../../src/ripple/resource/ripple_resource.cpp \
-    ../../src/ripple/rpc/ripple_rpc.cpp \
    ../../src/ripple/sitefiles/ripple_sitefiles.cpp \
-    ../../src/ripple/sophia/ripple_sophia.c \
    ../../src/ripple/sslutil/ripple_sslutil.cpp \
    ../../src/ripple/testoverlay/ripple_testoverlay.cpp \
    ../../src/ripple/types/ripple_types.cpp \
@@ -95,8 +95,9 @@ SOURCES += \
    ../../src/ripple_data/ripple_data.cpp \
    ../../src/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
    ../../src/ripple_leveldb/ripple_leveldb.cpp \
-    ../../src/ripple_mdb/ripple_mdb.c \
    ../../src/ripple_net/ripple_net.cpp \
+    ../../src/ripple_overlay/ripple_overlay.cpp \
+    ../../src/ripple_rpc/ripple_rpc.cpp \
    ../../src/ripple_websocket/ripple_websocket.cpp

 LIBS += \
--- a/Builds/VisualStudio2010/RippleD.props
+++ b/Builds/VisualStudio2010/RippleD.props
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <RepoDir>..\..</RepoDir>
-    <SrcDir>$(RepoDir)\src\cpp\ripple</SrcDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutDir>$(RepoDir)\build\VisualStudio2010\$(Configuration).$(Platform)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IntDir>$(RepoDir)\build\obj\VisualStudio2010\$(Configuration).$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>USE_LEVELDB;BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="RepoDir">
-      <Value>$(RepoDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SrcDir">
-      <Value>$(SrcDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
--- a/Builds/VisualStudio2010/RippleD.sln
+++ b/Builds/VisualStudio2010/RippleD.sln
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{EE95954F-3D34-4FB1-ADBD-FE8395233026}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EE95954F-3D34-4FB1-ADBD-FE8395233026}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE95954F-3D34-4FB1-ADBD-FE8395233026}.Debug|Win32.Build.0 = Debug|Win32
-		{EE95954F-3D34-4FB1-ADBD-FE8395233026}.Release|Win32.ActiveCfg = Release|Win32
-		{EE95954F-3D34-4FB1-ADBD-FE8395233026}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/Builds/VisualStudio2010/RippleD.vcxproj
+++ b/Builds/VisualStudio2010/RippleD.vcxproj
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EE95954F-3D34-4FB1-ADBD-FE8395233026}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>RippleD</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="RippleD.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt1.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt2.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt3.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt4.cpp" />
-    <ClCompile Include="..\..\modules\ripple_basics\ripple_basics.cpp" />
-    <ClCompile Include="..\..\modules\ripple_data\ripple_data.cpp" />
-    <ClCompile Include="..\..\src\cpp\database\sqlite3.c" />
-    <ClCompile Include="..\..\src\cpp\leveldb_core.cpp" />
-    <ClCompile Include="..\..\src\cpp\protobuf_core.cpp" />
-    <ClCompile Include="..\..\src\cpp\websocket_core.cpp" />
-    <ClCompile Include="..\..\Subtrees\beast\modules\beast_basics\beast_basics.cpp" />
-    <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/Builds/VisualStudio2010/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2010/RippleD.vcxproj.filters
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt1.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt2.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt3.cpp" />
-    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt4.cpp" />
-    <ClCompile Include="..\..\modules\ripple_basics\ripple_basics.cpp" />
-    <ClCompile Include="..\..\modules\ripple_data\ripple_data.cpp" />
-    <ClCompile Include="..\..\Subtrees\beast\modules\beast_basics\beast_basics.cpp">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\protobuf_core.cpp">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\websocket_core.cpp">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpp\database\sqlite3.c">
-      <Filter>Subtrees</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Ripple">
-      <UniqueIdentifier>{63db902e-0e7a-42d1-b5f5-663e4b48786c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Subtrees">
-      <UniqueIdentifier>{469e8a0a-64bf-4fa1-8b6f-81207db68577}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-</Project>
--- a/Builds/VisualStudio2013/RippleD.props
+++ b/Builds/VisualStudio2013/RippleD.props
@@ -5,8 +5,8 @@
    <RepoDir>..\..</RepoDir>
  </PropertyGroup>
  <PropertyGroup>
-    <OutDir>$(RepoDir)\build\VisualStudio2012\$(Configuration).$(Platform)\</OutDir>
-    <IntDir>$(RepoDir)\build\obj\VisualStudio2012\$(Configuration).$(Platform)\</IntDir>
+    <OutDir>$(RepoDir)\build\VisualStudio2013\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>$(RepoDir)\build\obj\VisualStudio2013\$(Configuration).$(Platform)\</IntDir>
    <TargetName>rippled</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -14,7 +14,7 @@
      <PreprocessorDefinitions>_VARIADIC_MAX=10;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir)\src\BeastConfig;$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
      <ExceptionHandling>Async</ExceptionHandling>
      <DisableSpecificWarnings>4018;4244</DisableSpecificWarnings>
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
--- a/Builds/VisualStudio2013/ripple.sln
+++ b/Builds/VisualStudio2013/ripple.sln
@@ -1,9 +1,11 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{B7F39ECD-473C-484D-BC34-31F8362506A5}"
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30110.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "..\..\src\beast\Builds\VisualStudio2013\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "..\..\src\beast\Builds\VisualStudio2012\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{B7F39ECD-473C-484D-BC34-31F8362506A5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +15,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.Build.0 = Debug|Win32
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|x64.ActiveCfg = Debug|x64
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|x64.Build.0 = Debug|x64
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|Win32.ActiveCfg = Release|Win32
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|Win32.Build.0 = Release|Win32
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.ActiveCfg = Release|x64
-		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.Build.0 = Release|x64
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.ActiveCfg = Debug|Win32
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.Build.0 = Debug|Win32
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|x64
@@ -29,6 +23,14 @@ Global
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.Build.0 = Release|Win32
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.ActiveCfg = Release|x64
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.Build.0 = Release|x64
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.Build.0 = Debug|Win32
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|x64.ActiveCfg = Debug|x64
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|x64.Build.0 = Debug|x64
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|Win32.ActiveCfg = Release|Win32
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|Win32.Build.0 = Release|Win32
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.ActiveCfg = Release|x64
+		{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/BIN
+++ b/BIN
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 #Ripple - P2P Payment Network

-##[![Build Status](https://ci.ripple.com/jenkins/buildStatus/icon?job=rippled)](https://ci.ripple.com/jenkins/job/rippled/)
+##[![Build Status](https://travis-ci.org/ripple/rippled.png?branch=develop)](https://travis-ci.org/ripple/rippled)

 This is the repository for Ripple's `rippled`, reference P2P network server.

--- a/89
+++ b/89
@@ -8,6 +8,7 @@ import glob
 import os
 import platform
 import re
+import sys

 OSX = bool(platform.mac_ver()[0])
 FreeBSD = bool('FreeBSD' == platform.system())
@@ -16,10 +17,12 @@ Ubuntu  = bool(Linux and 'Ubuntu' == platform.linux_distribution()[0])
 Debian  = bool(Linux and 'debian' == platform.linux_distribution()[0])
 Archlinux  = bool(Linux and ('','','') == platform.linux_distribution()) #Arch still has issues with the platform module

+USING_CLANG = OSX or os.environ.get('CC', None) == 'clang'
+
 #
 # We expect this to be set
-# 
-BOOST_HOME = os.environ.get("RIPPLED_BOOST_HOME", None) 
+#
+BOOST_HOME = os.environ.get("RIPPLED_BOOST_HOME", None)


 if OSX or Ubuntu or Debian or Archlinux:
@@ -33,8 +36,12 @@ else:
 # scons tools
 #

+HONOR_ENVS = ['CC', 'CXX', 'PATH']
+
 env = Environment(
-    tools = ['default', 'protoc']
+    tools = ['default', 'protoc'],
+    #ENV = dict((k, os.environ[k]) for k in HONOR_ENVS)
+    ENV = dict((k, os.environ[k]) for k in HONOR_ENVS if k in os.environ)
 )

 # Use a newer gcc on FreeBSD
@@ -44,12 +51,19 @@ if FreeBSD:
    env.Append(CCFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])
    env.Append(LINKFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])

-if OSX:
+if USING_CLANG:
    env.Replace(CC= 'clang')
    env.Replace(CXX= 'clang++')
-    env.Append(CXXFLAGS = ['-std=c++11', '-stdlib=libc++'])
-    env.Append(LINKFLAGS='-stdlib=libc++')
-    env['FRAMEWORKS'] = ['AppKit']
+
+    if Linux:
+        env.Append(CXXFLAGS = ['-std=c++11', '-stdlib=libstdc++'])
+        env.Append(LINKFLAGS='-stdlib=libstdc++')
+
+    if OSX:
+        env.Append(CXXFLAGS = ['-std=c++11', '-stdlib=libc++', 
+                               '-Wno-deprecated-register'])
+        env.Append(LINKFLAGS='-stdlib=libc++')
+        env['FRAMEWORKS'] = ['AppKit','Foundation']

 GCC_VERSION = re.split('\.', commands.getoutput(env['CXX'] + ' -dumpversion'))

@@ -93,17 +107,28 @@ BOOST_LIBS = [
    'boost_regex',
    'boost_system',
    'boost_thread',
-    'boost_random',
 ]

 # We whitelist platforms where the non -mt version is linked with pthreads. This
 # can be verified with: ldd libboost_filesystem.* If a threading library is
 # included the platform can be whitelisted.
-if FreeBSD or Ubuntu or Archlinux or OSX:
+# if FreeBSD or Ubuntu or Archlinux:
+
+if not (USING_CLANG and Linux) and (FreeBSD or Ubuntu or Archlinux or Debian or OSX):
    # non-mt libs do link with pthreads.
    env.Append(
        LIBS = BOOST_LIBS
    )
+elif Linux and USING_CLANG and Ubuntu:
+    # It's likely going to be here if using boost 1.55 
+    boost_statics = [ ("/usr/lib/x86_64-linux-gnu/lib%s.a" % a) for a in 
+                      BOOST_LIBS ]
+
+    if not all(os.path.exists(f) for f in boost_statics):
+        # Else here
+        boost_statics = [("/usr/lib/lib%s.a" % a) for a in BOOST_LIBS]
+    
+    env.Append(LIBS = [File(f) for f in boost_statics])
 else:
    env.Append(
        LIBS = [l + '-mt' for l in BOOST_LIBS]
@@ -124,11 +149,10 @@ else:
 #
 INCLUDE_PATHS = [
    '.',
-    'src',
+    'src/BeastConfig',
    'src/leveldb',
    'src/leveldb/port',
    'src/leveldb/include',
-    'src/beast',
    'build/proto'
    ]

@@ -159,14 +183,15 @@ COMPILED_FILES.extend([
    'src/ripple/http/ripple_http.cpp',
    'src/ripple/json/ripple_json.cpp',
    'src/ripple/peerfinder/ripple_peerfinder.cpp',
+    'src/ripple/radmap/ripple_radmap.cpp',
    'src/ripple/resource/ripple_resource.cpp',
-    'src/ripple/rpc/ripple_rpc.cpp',
+    'src/ripple/rocksdb/ripple_rocksdb.cpp',
    'src/ripple/sitefiles/ripple_sitefiles.cpp',
-    'src/ripple/sophia/ripple_sophia.c',
    'src/ripple/sslutil/ripple_sslutil.cpp',
    'src/ripple/testoverlay/ripple_testoverlay.cpp',
    'src/ripple/types/ripple_types.cpp',
-    'src/ripple/validators/ripple_validators.cpp'
+    'src/ripple/validators/ripple_validators.cpp',
+	'src/ripple/common/ripple_common.cpp',
    ])

 # ------------------------------
@@ -182,13 +207,15 @@ COMPILED_FILES.extend([
    'src/ripple_app/ripple_app_pt6.cpp',
    'src/ripple_app/ripple_app_pt7.cpp',
    'src/ripple_app/ripple_app_pt8.cpp',
+    'src/ripple_app/ripple_app_pt9.cpp',
    'src/ripple_basics/ripple_basics.cpp',
    'src/ripple_core/ripple_core.cpp',
    'src/ripple_data/ripple_data.cpp',
    'src/ripple_hyperleveldb/ripple_hyperleveldb.cpp',
    'src/ripple_leveldb/ripple_leveldb.cpp',
-    'src/ripple_mdb/ripple_mdb.c',
    'src/ripple_net/ripple_net.cpp',
+    'src/ripple_overlay/ripple_overlay.cpp',
+    'src/ripple_rpc/ripple_rpc.cpp',
    'src/ripple_websocket/ripple_websocket.cpp'
    ])

@@ -227,7 +254,7 @@ env.Append(
        ['rt'] if not OSX else [] +\
        [
            'z'
-        ] 
+        ]
 )

 # We prepend, in case there's another BOOST somewhere on the path
@@ -238,23 +265,41 @@ if BOOST_HOME is not None:

 if not OSX:
    env.Append(LINKFLAGS = [
-        '-rdynamic', '-pthread', 
+        '-rdynamic',
+        '-pthread',
        ])

 DEBUGFLAGS  = ['-g', '-DDEBUG', '-D_DEBUG']

 env.Append(CCFLAGS = ['-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts']+DEBUGFLAGS)
-env.Append(CXXFLAGS = ['-O1', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+DEBUGFLAGS)
+if not USING_CLANG:
+     more_warnings = ['-Wno-unused-local-typedefs']
+else:
+     # This disables the "You said it was a struct AND a class, wth is going on
+     # warnings"
+     more_warnings = ['-Wno-mismatched-tags']
+     # This needs to be a CCFLAGS not a CXXFLAGS
+     env.Append(CCFLAGS = more_warnings)

+env.Append(CXXFLAGS = ['-O1','-pthread', '-Wno-invalid-offsetof', '-Wformat']+more_warnings+DEBUGFLAGS)

 # RTTI is required for Beast and CountedObject.
 #
 env.Append(CXXFLAGS = ['-frtti'])

-if (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) == 6):
-    env.Append(CXXFLAGS = ['-std=c++0x'])
-elif (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)):
-    env.Append(CXXFLAGS = ['-std=c++11'])
+UBUNTU_GCC_48_INSTALL_STEPS = '''
+https://ripple.com/wiki/Ubuntu_build_instructions#Ubuntu_versions_older_than_13.10_:_Install_gcc_4.8'''
+
+if not USING_CLANG:
+    if (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) < 8):
+        print "\nrippled, using c++11, requires g++ version >= 4.8 to compile"
+
+        if Ubuntu:
+          print UBUNTU_GCC_48_INSTALL_STEPS
+
+        sys.exit(1)
+    else:
+        env.Append(CXXFLAGS = ['-std=c++11'])

 # FreeBSD doesn't support O_DSYNC
 if FreeBSD:
--- a/doc/rippled-example.cfg
+++ b/doc/rippled-example.cfg
@@ -60,39 +60,36 @@
 #
 # [ips]
 #
-#   List of ips where the Ripple protocol is served.  For a starter list,
-#   you can copy entries from: https://ripple.com/ripple.txt
+#   List of hostnames or ips where the Ripple protocol is served.  For a starter
+#   list, you can either copy entries from: https://ripple.com/ripple.txt or if
+#   you prefer you can specify r.ripple.com 51235
 #
-#   Domain names are not allowed. One ipv4 or ipv6 address per line.  A port
-#   may optionally be specified after adding a space to the address.  By
-#   convention, if known, IPs are listed in from most to least trusted.
+#   One IPv4 address or domain names per line is allowed. A port may optionally
+#   be specified after adding a space to the address.  By convention, if known,
+#   IPs are listed in from most to least trusted.
 #
 #   Examples:
 #    192.168.0.1
 #    192.168.0.1 3939
-#    2001:0db8:0100:f101:0210:a4ff:fee3:9566
+#    r.ripple.com 51235
 #
-#   Here's the recent set of good, well known addresses:
+#   This will give you a good, up-to-date list of addresses:
 #
 #   [ips]
-#     54.225.112.220 51235
-#     54.225.123.13  51235
-#     54.227.239.106 51235
-#     107.21.251.218 51235
-#     184.73.226.101 51235
-#     23.23.201.55   51235
+#   r.ripple.com 51235
 #
 #
 #
 # [ips_fixed]
 #
-#   List of IP addresses to which rippled should always maintain peer
-#   connections with. This is useful for manually forming private networks,
-#   for example to configure a validation server that connects to the
+#   List of IP addresses or hostnames to which rippled should always attempt to
+#   maintain peer connections with. This is useful for manually forming private
+#   networks, for example to configure a validation server that connects to the
 #   Ripple network through a public-facing server, or for building a set
 #   of cluster peers.
 #
-#
+#   One IPv4 address or domain names per line is allowed. A port may optionally
+#   be specified after adding a space to the address.
 #
 # [peer_ip]
 #
@@ -494,6 +491,20 @@
 #
 #
 #
+# [fetch_depth]
+#
+#   The number of past ledgers to serve to other peers that request historical
+#   ledger data (or "full" for no limit).
+#
+#   Servers that require low latency and high local performance may wish to
+#   restrict the historical ledgers they are willing to serve. Setting this
+#   below 32 can harm network stability as servers require easy access to
+#   recent history to stay in sync. Values below 128 are not recommended.
+#
+#   The default is: full
+#
+#
+#
 # [validation_seed]
 #
 #   To perform validation, this section should contain either a validation seed
@@ -655,8 +666,8 @@
 #   Choices for 'type' (not case-sensitive)
 #       HyperLevelDB        Use an improved version of LevelDB (preferred)
 #       LevelDB             Use Google's LevelDB database (deprecated)
-#       MDB                 Use MDB
 #       none                Use no backend
+#       RocksDB             Use Facebook's RocksDB database
 #       SQLite              Use SQLite
 #
 #   Required keys:
@@ -707,6 +718,41 @@
 #
 #
 #
+# [insight]
+#
+#   Configuration parameters for the Beast.Insight stats collection module.
+#
+#   Insight is a module that collects information from the areas of rippled
+#   that have instrumentation. The configuration paramters control where the
+#   collection metrics are sent. The parameters are expressed as key = value
+#   pairs with no white space. The main parameter is the choice of server:
+#
+#     "server"
+#
+#       Choice of server to send metrics to. Currently the only choice is
+#       "statsd" which sends UDP packets to a StatsD daemon, which must be
+#       running while rippled is running. More information on StatsD is
+#       available here:
+#           https://github.com/b/statsd_spec
+#
+#       When server=statsd, these additional keys are used:
+#
+#       "address" The UDP address and port of the listening StatsD server,
+#                 in the format, n.n.n.n:port.
+#
+#       "prefix"  A string prepended to each collected metric. This is used
+#                 to distinguish between different running instances of rippled.
+#
+#     If this section is missing, or the server type is unspecified or unknown,
+#     statistics are not collected or reported.
+#
+#   Example:
+#
+#     [insight]
+#     server=statsd
+#     address=192.168.0.95:4201
+#     prefix=my_validator
+#   
 #-------------------------------------------------------------------------------

 # Allow other peers to connect to this server.
@@ -748,13 +794,14 @@
 medium

 # Note that HyperLevelDB is unavailable on Windows platforms
-#
 [node_db]
 type=HyperLevelDB
-path=db/hyperldb
+path=/etc/ripple/db/hyperldb

+# This needs to be an absolute directory reference, not a relative one.
+# Modify this value as required.
 [debug_logfile]
-log/debug.log
+/var/log/rippled/debug.log

 [sntp_servers]
 time.windows.com
@@ -763,12 +810,20 @@ time.nist.gov
 pool.ntp.org

 # Where to find some other servers speaking the Ripple protocol.
-# This set of addresses is recent as of September 5, 2013
 #
 [ips]
-54.225.112.220 51235
-54.225.123.13  51235
-54.227.239.106 51235
-107.21.251.218 51235
-184.73.226.101 51235
-23.23.201.55   51235
+r.ripple.com 51235
+
+# These validators are taken from the v0.16 release notes on the wiki:
+# https://ripple.com/wiki/Latest_rippled_release_notes
+[validators]
+n9KPnVLn7ewVzHvn218DcEYsnWLzKerTDwhpofhk4Ym1RUq4TeGw    RIP1
+n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V    RIP2
+n94rSdgTyBNGvYg8pZXGuNt59Y5bGAZGxbxyvjDaqD9ceRAgD85P    RIP3
+n9LeQeDcLDMZKjx1TZtrXoLBLo5q1bR1sUQrWG7tEADFU6R27UBp    RIP4
+n9KF6RpvktjNs2MDBkmxpJbup4BKrKeMKDXPhaXkq7cKTwLmWkFr    RIP5
+
+# Ditto.
+[validation_quorum]
+3
+
--- a/doc/rippled.init
+++ b/doc/rippled.init
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          ripple
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts the ripple network node
+# Description:       starts rippled using start-stop-daemon
+### END INIT INFO
+
+set -e
+
+NAME=rippled
+USER="rippled"
+GROUP="rippled"
+PIDFILE=/var/run/$NAME.pid
+DAEMON=/usr/local/sbin/rippled
+DAEMON_OPTS="--conf /etc/ripple/rippled.cfg"
+NET_OPTS="--net $DAEMON_OPTS"
+LOGDIR="/var/log/rippled"
+DBDIR="/var/db/rippled/db/hyperldb"
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+# I wish it didn't come down to this, but this is the easiest way to ensure
+# sanity of an install.
+if [ ! -d $LOGDIR ]; then
+	mkdir -p $LOGDIR
+	chown $USER:$GROUP $LOGDIR
+fi
+if [ ! -d $DBDIR ]; then
+	mkdir -p $DBDIR
+	chown -R $USER:$GROUP $DBDIR
+fi
+
+case "$1" in
+    start)
+        echo -n "Starting daemon: "$NAME
+        start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE \
+            --exec $DAEMON --chuid $USER --group $GROUP --verbose -- $NET_OPTS
+        echo "."
+        ;;
+
+    stop)
+        echo -n "Stopping daemon: "$NAME
+        $DAEMON $DAEMON_OPTS stop
+        rm -f $PIDFILE
+        echo "."
+        ;;
+
+    restart)
+        echo -n "Restarting daemon: "$NAME
+        $DAEMON $DAEMON_OPTS stop
+        rm -f $PIDFILE
+        start-stop-daemon --start --quiet --background -m --pidfile $PIDFILE \
+            --exec $DAEMON --chuid $USER --group $GROUP -- $NET_OPTS
+        echo "."
+        ;;
+
+    status)
+        echo "Status of $NAME:"
+        echo -n "PID of $NAME: "
+        if [ -f "$PIDFILE" ]; then
+                cat $PIDFILE
+                $DAEMON $DAEMON_OPTS server_info
+        else
+                echo "$NAME not running."
+        fi
+        echo "."
+        ;;
+
+    fetch)
+        echo "$NAME ledger fetching info:"
+        $DAEMON $DAEMON_OPTS fetch_info
+        echo "."
+        ;;
+
+    uptime)
+        echo "$NAME uptime:"
+        $DAEMON $DAEMON_OPTS get_counts
+        echo "."
+        ;;
+
+    startconfig)
+        echo "$NAME is being started with the following command line:"
+        echo "$DAEMON $NET_OPTS"
+        echo "."
+        ;;
+
+    command)
+        # Truncate the script's argument vector by one position to get rid of
+        # this entry.
+        shift
+
+        # Pass the remainder of the argument vector to rippled.
+        $DAEMON $DAEMON_OPTS "$@"
+        echo "."
+        ;;
+
+    test)
+        $DAEMON $DAEMON_OPTS ping
+        echo "."
+        ;;
+
+    *)
+        echo "Usage: $0 {start|stop|restart|status|fetch|uptime|startconfig|"
+        echo "           command|test}"
+        exit 1
+esac
+
+exit 0
+
--- a/doc/todo/VFALCO_TODO.txt
+++ b/doc/todo/VFALCO_TODO.txt
@@ -22,9 +22,6 @@ David Features:

 - std::priority_queue for DeadlineTimer

- Change ProxyInfo to use IPAddress, get rid of IPv4Address from the parsing
-  code
-
 - Validators should delay the application of newly downloaded lists from
  sources, to mitigate the effects of attacks. Unless there's no validators
  in the list.
@@ -34,7 +31,7 @@ David Features:

 - Look into using CMake

- IPv6 support in IPAddress
+- IPv6 support in IP::Endpoint

 - Configuration list for Jenkins

--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
  },

  "scripts": {
-    "test": "mocha test/*-test.{js,coffee}"
+    "test": "mocha test/websocket-test.js test/server-test.js test/*-test.{js,coffee}"
  },

  "repository": {
@@ -31,4 +31,4 @@
  },

  "readmeFilename": "README.md"
-}
+}
--- a/src/BeastConfig/BeastConfig.h
+++ b/src/BeastConfig/BeastConfig.h
@@ -107,6 +107,13 @@
 #define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
 #endif

+/** Config: BEAST_SQLITE_FORCE_NDEBUG
+    Setting this option forces sqlite into release mode even if NDEBUG is not set
+*/
+#ifndef BEAST_SQLITE_FORCE_NDEBUG
+#define BEAST_SQLITE_FORCE_NDEBUG 1
+#endif
+
 //------------------------------------------------------------------------------
 //
 // Boost
@@ -156,6 +163,20 @@

 //------------------------------------------------------------------------------

+// These control whether or not certain functionality gets
+// compiled into the resulting rippled executable
+
+/** Config: RIPPLE_ROCKSDB_AVAILABLE
+    Controls whether or not the RocksDB database back-end is compiled into
+    rippled. RocksDB requires a relatively modern C++ compiler (tested with
+    gcc versions 4.8.1 and later) that supports some C++11 features.
+*/
+#ifndef   RIPPLE_ROCKSDB_AVAILABLE
+//#define RIPPLE_ROCKSDB_AVAILABLE 0
+#endif
+
+//------------------------------------------------------------------------------
+
 // Here temporarily to turn off new Validations code while it
 // is being written.
 //
@@ -163,26 +184,4 @@
 #define RIPPLE_USE_VALIDATORS 0
 #endif

-// Turning this on will use the new PeerFinder logic to establish connections
-// to other peers. Even with this off, PeerFinder will still send mtENDPOINTS
-// messages as needed, and collect legacy IP endpoint information.
-//
-#ifndef RIPPLE_USE_PEERFINDER
-#define RIPPLE_USE_PEERFINDER 0
-#endif
-
-// Here temporarily
-// Controls whether or not the new RPC::Manager logic will be
-// used to invoke RPC commands before they pass to the original code.
-#ifndef  RIPPLE_USE_RPC_SERVICE_MANAGER
-#define  RIPPLE_USE_RPC_SERVICE_MANAGER 0
-#endif
-
-// Here temporarily
-// Controls whether or not the new Resource manager replaces the BlackList
-// and LoadManager for measuring and controlling access to the server
-#ifndef RIPPLE_USE_RESOURCE_MANAGER
-#define RIPPLE_USE_RESOURCE_MANAGER 0
-#endif
-
 #endif
--- a/src/README.md
+++ b/src/README.md
@@ -21,6 +21,16 @@ About git-subtree:
 https://github.com/apenwarr/git-subtree <br>
 http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ <br>

+<table align=left><tr>
+<th>dir</th>
+<th>What</th>
+</tr><tr>
+<td>beast</td>
+<td>Beast, the amazing cross-platform library.<br>
+    git@github.com:vinniefalco/Beast.git
+</td>
+</tr></table>
+
 ## ./beast

 Beast, the amazing cross-platform library.
--- a/src/beast/Builds/VisualStudio2013/Beast.props
+++ b/src/beast/Builds/VisualStudio2013/Beast.props
@@ -8,7 +8,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BEAST_COMPILING_STATIC_LIBARARY=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <MinimalRebuild>false</MinimalRebuild>
      <AdditionalIncludeDirectories>$(RepoDir)\config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -83,12 +83,26 @@
  <ItemGroup>
    <ClInclude Include="..\..\beast\Arithmetic.h" />
    <ClInclude Include="..\..\beast\Asio.h" />
+    <ClInclude Include="..\..\beast\asio\abstract_socket.h" />
+    <ClInclude Include="..\..\beast\asio\bind_handler.h" />
+    <ClInclude Include="..\..\beast\asio\buffer_sequence.h" />
+    <ClInclude Include="..\..\beast\asio\io_latency_probe.h" />
    <ClInclude Include="..\..\beast\asio\IPAddressConversion.h" />
+    <ClInclude Include="..\..\beast\asio\placeholders.h" />
+    <ClInclude Include="..\..\beast\asio\shared_handler.h" />
+    <ClInclude Include="..\..\beast\asio\socket_wrapper.h" />
+    <ClInclude Include="..\..\beast\asio\wrap_handler.h" />
    <ClInclude Include="..\..\beast\Atomic.h" />
    <ClInclude Include="..\..\beast\Boost.h" />
    <ClInclude Include="..\..\beast\boost\ErrorCode.h" />
    <ClInclude Include="..\..\beast\ByteOrder.h" />
+    <ClInclude Include="..\..\beast\chrono\abstract_clock.h" />
+    <ClInclude Include="..\..\beast\chrono\basic_seconds_clock.h" />
+    <ClInclude Include="..\..\beast\chrono\chrono_io.h" />
+    <ClInclude Include="..\..\beast\chrono\chrono_util.h" />
    <ClInclude Include="..\..\beast\chrono\CPUMeter.h" />
+    <ClInclude Include="..\..\beast\chrono\manual_clock.h" />
+    <ClInclude Include="..\..\beast\chrono\ratio_io.h" />
    <ClInclude Include="..\..\beast\chrono\RelativeTime.h" />
    <ClInclude Include="..\..\beast\chrono\ScopedTimeInterval.h" />
    <ClInclude Include="..\..\beast\Config.h" />
@@ -109,40 +123,78 @@
    <ClInclude Include="..\..\beast\config\SelectPlatformConfig.h" />
    <ClInclude Include="..\..\beast\config\SelectStdlibConfig.h" />
    <ClInclude Include="..\..\beast\config\StandardConfig.h" />
+    <ClInclude Include="..\..\beast\container\aged_container_utility.h" />
+    <ClInclude Include="..\..\beast\container\aged_container.h" />
+    <ClInclude Include="..\..\beast\container\aged_map.h" />
+    <ClInclude Include="..\..\beast\container\aged_multimap.h" />
+    <ClInclude Include="..\..\beast\container\aged_multiset.h" />
+    <ClInclude Include="..\..\beast\container\aged_set.h" />
+    <ClInclude Include="..\..\beast\container\aged_unordered_map.h" />
+    <ClInclude Include="..\..\beast\container\aged_unordered_multimap.h" />
+    <ClInclude Include="..\..\beast\container\aged_unordered_multiset.h" />
+    <ClInclude Include="..\..\beast\container\aged_unordered_set.h" />
+    <ClInclude Include="..\..\beast\container\detail\aged_associative_container.h" />
+    <ClInclude Include="..\..\beast\container\detail\aged_ordered_container.h" />
+    <ClInclude Include="..\..\beast\container\detail\aged_container_iterator.h" />
+    <ClInclude Include="..\..\beast\container\detail\aged_unordered_container.h" />
+    <ClInclude Include="..\..\beast\container\buffer_view.h" />
    <ClInclude Include="..\..\beast\Crypto.h" />
+    <ClInclude Include="..\..\beast\crypto\BinaryEncoding.h" />
    <ClInclude Include="..\..\beast\crypto\impl\sha2\sha2.h" />
    <ClInclude Include="..\..\beast\crypto\MurmurHash.h" />
    <ClInclude Include="..\..\beast\crypto\Sha256.h" />
+    <ClInclude Include="..\..\beast\crypto\UnsignedInteger.h" />
+    <ClInclude Include="..\..\beast\crypto\UnsignedIntegerCalc.h" />
    <ClInclude Include="..\..\beast\CStdInt.h" />
+    <ClInclude Include="..\..\beast\cxx14\algorithm.h" />
+    <ClInclude Include="..\..\beast\cxx14\config.h" />
+    <ClInclude Include="..\..\beast\cxx14\functional.h" />
+    <ClInclude Include="..\..\beast\cxx14\memory.h" />
+    <ClInclude Include="..\..\beast\cxx14\type_traits.h" />
+    <ClInclude Include="..\..\beast\cxx14\utility.h" />
+    <ClInclude Include="..\..\beast\cyclic_iterator.h" />
    <ClInclude Include="..\..\beast\FixedArray.h" />
    <ClInclude Include="..\..\beast\HeapBlock.h" />
    <ClInclude Include="..\..\beast\HTTP.h" />
    <ClInclude Include="..\..\beast\http\impl\http-parser\http_parser.h" />
+    <ClInclude Include="..\..\beast\http\impl\http_parser.h" />
    <ClInclude Include="..\..\beast\http\ParsedURL.h" />
    <ClInclude Include="..\..\beast\http\URL.h" />
+    <ClInclude Include="..\..\beast\Insight.h" />
+    <ClInclude Include="..\..\beast\insight\Base.h" />
+    <ClInclude Include="..\..\beast\insight\BaseImpl.h" />
+    <ClInclude Include="..\..\beast\insight\Collector.h" />
+    <ClInclude Include="..\..\beast\insight\Counter.h" />
+    <ClInclude Include="..\..\beast\insight\CounterImpl.h" />
+    <ClInclude Include="..\..\beast\insight\Event.h" />
+    <ClInclude Include="..\..\beast\insight\EventImpl.h" />
+    <ClInclude Include="..\..\beast\insight\Gauge.h" />
+    <ClInclude Include="..\..\beast\insight\GaugeImpl.h" />
+    <ClInclude Include="..\..\beast\insight\Group.h" />
+    <ClInclude Include="..\..\beast\insight\Groups.h" />
+    <ClInclude Include="..\..\beast\insight\Hook.h" />
+    <ClInclude Include="..\..\beast\insight\HookImpl.h" />
+    <ClInclude Include="..\..\beast\insight\Meter.h" />
+    <ClInclude Include="..\..\beast\insight\MeterImpl.h" />
+    <ClInclude Include="..\..\beast\insight\NullCollector.h" />
+    <ClInclude Include="..\..\beast\insight\StatsDCollector.h" />
    <ClInclude Include="..\..\beast\Intrusive.h" />
-    <ClInclude Include="..\..\beast\intrusive\ForwardList.h" />
-    <ClInclude Include="..\..\beast\intrusive\IntrusiveArray.h" />
    <ClInclude Include="..\..\beast\intrusive\List.h" />
    <ClInclude Include="..\..\beast\intrusive\LockFreeStack.h" />
-    <ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
    <ClInclude Include="..\..\beast\Memory.h" />
    <ClInclude Include="..\..\beast\MPL.h" />
-    <ClInclude Include="..\..\beast\mpl\AddConst.h" />
-    <ClInclude Include="..\..\beast\mpl\CopyConst.h" />
-    <ClInclude Include="..\..\beast\mpl\IfCond.h" />
    <ClInclude Include="..\..\beast\mpl\IsCallPossible.h" />
-    <ClInclude Include="..\..\beast\mpl\PointerToOther.h" />
-    <ClInclude Include="..\..\beast\mpl\RemoveConst.h" />
-    <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h" />
-    <ClInclude Include="..\..\beast\mpl\RemoveReference.h" />
-    <ClInclude Include="..\..\beast\mpl\RemoveVolatile.h" />
    <ClInclude Include="..\..\beast\Net.h" />
    <ClInclude Include="..\..\beast\net\BufferType.h" />
+    <ClInclude Include="..\..\beast\net\detail\Parse.h" />
    <ClInclude Include="..\..\beast\net\DynamicBuffer.h" />
    <ClInclude Include="..\..\beast\net\IPAddress.h" />
+    <ClInclude Include="..\..\beast\net\IPAddressV4.h" />
+    <ClInclude Include="..\..\beast\net\IPAddressV6.h" />
+    <ClInclude Include="..\..\beast\net\IPEndpoint.h" />
    <ClInclude Include="..\..\beast\SafeBool.h" />
    <ClInclude Include="..\..\beast\SmartPtr.h" />
+    <ClInclude Include="..\..\beast\smart_ptr\AbstractObject.h" />
    <ClInclude Include="..\..\beast\smart_ptr\ContainerDeletePolicy.h" />
    <ClInclude Include="..\..\beast\smart_ptr\ScopedPointer.h" />
    <ClInclude Include="..\..\beast\smart_ptr\SharedObject.h" />
@@ -164,6 +216,7 @@
    <ClInclude Include="..\..\beast\threads\detail\DispatchedHandler.h" />
    <ClInclude Include="..\..\beast\threads\LockGuard.h" />
    <ClInclude Include="..\..\beast\threads\RecursiveMutex.h" />
+    <ClInclude Include="..\..\beast\threads\semaphore.h" />
    <ClInclude Include="..\..\beast\threads\ServiceQueue.h" />
    <ClInclude Include="..\..\beast\threads\SharedData.h" />
    <ClInclude Include="..\..\beast\threads\SharedLockGuard.h" />
@@ -180,28 +233,20 @@
    <ClInclude Include="..\..\beast\type_traits\IntegralConstant.h" />
    <ClInclude Include="..\..\beast\type_traits\IsIntegral.h" />
    <ClInclude Include="..\..\beast\type_traits\IsSigned.h" />
-    <ClInclude Include="..\..\beast\type_traits\RemoveSigned.h" />
+    <ClInclude Include="..\..\beast\type_traits\maybe_const.h" />
    <ClInclude Include="..\..\beast\Uncopyable.h" />
    <ClInclude Include="..\..\beast\Utility.h" />
-    <ClInclude Include="..\..\beast\utility\BaseFromMember.h" />
    <ClInclude Include="..\..\beast\utility\Debug.h" />
-    <ClInclude Include="..\..\beast\utility\EnableIf.h" />
+    <ClInclude Include="..\..\beast\utility\empty_base_optimization.h" />
    <ClInclude Include="..\..\beast\utility\Error.h" />
+    <ClInclude Include="..\..\beast\utility\hash_pair.h" />
    <ClInclude Include="..\..\beast\utility\Journal.h" />
    <ClInclude Include="..\..\beast\utility\LeakChecked.h" />
    <ClInclude Include="..\..\beast\utility\PropertyStream.h" />
    <ClInclude Include="..\..\beast\utility\StaticObject.h" />
    <ClInclude Include="..\..\beast\Version.h" />
    <ClInclude Include="..\..\config\BeastConfig.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\AbstractHandler.h" />
    <ClInclude Include="..\..\modules\beast_asio\async\AsyncObject.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\WrapHandler.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerAllocator.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerPtr.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerType.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\BuffersType.h" />
    <ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h" />
    <ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h" />
    <ClInclude Include="..\..\modules\beast_asio\basics\SharedArg.h" />
@@ -225,10 +270,6 @@
    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetector.h" />
    <ClInclude Include="..\..\modules\beast_asio\protocol\InputParser.h" />
    <ClInclude Include="..\..\modules\beast_asio\protocol\PrefilledReadStream.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\Socket.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketBase.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapper.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapperStrand.h" />
    <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h" />
    <ClInclude Include="..\..\modules\beast_asio\system\OpenSSLIncludes.h" />
    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeer.h" />
@@ -244,19 +285,15 @@
    <ClInclude Include="..\..\modules\beast_asio\tests\PeerTest.h" />
    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerType.h" />
    <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\AbstractFifo.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\Array.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\ArrayAllocationBase.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\DynamicObject.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\ElementComparator.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\LinkedListPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\LockFreeQueue.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\NamedValueSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\OwnedArray.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\PropertySet.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\SharedObjectArray.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\ScopedValueSetter.h" />
-    <ClInclude Include="..\..\modules\beast_core\containers\SortedSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\SparseSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\Variant.h" />
    <ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h" />
@@ -278,24 +315,14 @@
    <ClInclude Include="..\..\modules\beast_core\logging\FileLogger.h" />
    <ClInclude Include="..\..\modules\beast_core\logging\Logger.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\BigInteger.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\Expression.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\Interval.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\Math.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\Random.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\Range.h" />
-    <ClInclude Include="..\..\modules\beast_core\maths\uint24.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicCounter.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicFlag.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicState.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\CacheLine.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\MemoryAlignment.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\MemoryBlock.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\OptionalScopedPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\RecycledObjectPool.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\WeakReference.h" />
    <ClInclude Include="..\..\modules\beast_core\misc\Main.h" />
    <ClInclude Include="..\..\modules\beast_core\misc\Result.h" />
    <ClInclude Include="..\..\modules\beast_core\misc\Uuid.h" />
@@ -329,7 +356,6 @@
    <ClInclude Include="..\..\modules\beast_core\text\StringArray.h" />
    <ClInclude Include="..\..\modules\beast_core\text\StringPairArray.h" />
    <ClInclude Include="..\..\modules\beast_core\text\StringPool.h" />
-    <ClInclude Include="..\..\modules\beast_core\text\TextDiff.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\ChildProcess.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\CriticalSection.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\DynamicLibrary.h" />
@@ -342,7 +368,6 @@
    <ClInclude Include="..\..\modules\beast_core\threads\ScopedWriteLock.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\SpinDelay.h" />
    <ClInclude Include="..\..\modules\beast_core\thread\DeadlineTimer.h" />
-    <ClInclude Include="..\..\modules\beast_core\thread\Semaphore.h" />
    <ClInclude Include="..\..\modules\beast_core\thread\Workers.h" />
    <ClInclude Include="..\..\modules\beast_core\thread\detail\ScopedLock.h" />
    <ClInclude Include="..\..\modules\beast_core\thread\detail\TrackedMutex.h" />
@@ -370,14 +395,6 @@
    <ClInclude Include="..\..\modules\beast_core\zip\zlib\zconf.in.h" />
    <ClInclude Include="..\..\modules\beast_core\zip\zlib\zlib.h" />
    <ClInclude Include="..\..\modules\beast_core\zip\zlib\zutil.h" />
-    <ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h" />
-    <ClInclude Include="..\..\modules\beast_crypto\math\BinaryEncoding.h" />
-    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h" />
-    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedIntegerCalc.h" />
-    <ClInclude Include="..\..\modules\beast_db\beast_db.h" />
-    <ClInclude Include="..\..\modules\beast_db\keyvalue\KeyvaDB.h" />
-    <ClInclude Include="..\..\modules\beast_extras\beast_extras.h" />
-    <ClInclude Include="..\..\modules\beast_extras\traits\BoostLockableTraits.h" />
    <ClInclude Include="..\..\modules\beast_sqdb\api\backend.h" />
    <ClInclude Include="..\..\modules\beast_sqdb\api\blob.h" />
    <ClInclude Include="..\..\modules\beast_sqdb\api\into.h" />
@@ -403,6 +420,12 @@
    <ClInclude Include="..\..\modules\beast_sqlite\sqlite\sqlite3ext.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\beast\asio\abstract_socket.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\asio\Asio.cpp" />
    <ClCompile Include="..\..\beast\asio\impl\IPAddressConversion.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -412,19 +435,56 @@
    </ClCompile>
    <ClCompile Include="..\..\beast\boost\Boost.cpp" />
    <ClCompile Include="..\..\beast\chrono\Chrono.cpp" />
+    <ClCompile Include="..\..\beast\chrono\impl\basic_seconds_clock.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\chrono_io.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\chrono\impl\CPUMeter.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\abstract_clock.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\chrono\impl\RelativeTime.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\beast\container\Container.cpp" />
+    <ClCompile Include="..\..\beast\container\impl\aged_associative_container.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\container\tests\buffer_view.test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\crypto\Crypto.cpp" />
+    <ClCompile Include="..\..\beast\crypto\impl\BinaryEncoding.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\crypto\impl\MurmurHash.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -455,6 +515,19 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\UnsignedInteger.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\cxx14\cxx14.cpp" />
+    <ClCompile Include="..\..\beast\cxx14\tests\integer_sequence.test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\http\HTTP.cpp" />
    <ClCompile Include="..\..\beast\http\impl\http_parser.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -498,6 +571,49 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Collector.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Group.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Groups.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Hook.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Metric.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\NullCollector.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\StatsDCollector.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\Insight.cpp" />
    <ClCompile Include="..\..\beast\net\impl\DynamicBuffer.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -510,7 +626,31 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPAddressV4.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPAddressV6.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\net\Net.cpp" />
+    <ClCompile Include="..\..\beast\smart_ptr\impl\AbstractObject.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\smart_ptr\SmartPtr.cpp" />
    <ClCompile Include="..\..\beast\strings\impl\CharacterFunctions.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -562,6 +702,12 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\beast\threads\Threads.cpp" />
+    <ClCompile Include="..\..\beast\utility\impl\Assert.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\beast\utility\impl\Debug.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -599,12 +745,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\beast\utility\Utility.cpp" />
-    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_asio\basics\PeerRole.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -682,18 +822,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\Socket.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\SocketBase.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_asio\system\BoostUnitTests.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -755,12 +883,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp" />
-    <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\containers\DynamicObject.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -879,12 +1001,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\Expression.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\maths\Random.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1149,12 +1265,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\TextDiff.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\threads\ChildProcess.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1185,12 +1295,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\Semaphore.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\thread\Workers.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1317,27 +1421,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp" />
-    <ClCompile Include="..\..\modules\beast_crypto\math\BinaryEncoding.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_db\beast_db.cpp" />
-    <ClCompile Include="..\..\modules\beast_db\keyvalue\KeyvaDB.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp" />
    <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.cpp" />
    <ClCompile Include="..\..\modules\beast_sqdb\source\blob.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1426,31 +1509,32 @@
    <ProjectGuid>{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>beast</RootNamespace>
+    <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -1482,6 +1566,8 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@@ -1510,6 +1596,8 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
@@ -135,18 +135,6 @@
    <Filter Include="beast_core\diagnostic">
      <UniqueIdentifier>{69e28551-92ea-420b-a465-75ed248e3b59}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast_crypto">
-      <UniqueIdentifier>{62b1f8e3-79e4-46cc-b3fb-a12754aef249}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast_crypto\math">
-      <UniqueIdentifier>{1170f2bc-2456-410a-ab2b-c45f6ed37b9e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast_db">
-      <UniqueIdentifier>{4834218f-f13f-41bc-a8a0-50314a3a99a3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast_db\keyvalue">
-      <UniqueIdentifier>{15a98fee-1b52-45eb-9480-514b8750d755}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast_sqlite">
      <UniqueIdentifier>{cbf5f5a3-5d66-4b6d-996d-20ed14b41793}</UniqueIdentifier>
    </Filter>
@@ -171,9 +159,6 @@
    <Filter Include="beast_asio">
      <UniqueIdentifier>{54bbe439-76c3-4781-becc-9c70a2be6d82}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast_asio\sockets">
-      <UniqueIdentifier>{af535ad5-a06c-462f-8ac0-8207a708e032}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast_asio\system">
      <UniqueIdentifier>{c7a576bb-27b2-486e-aa14-3c51aa86c50f}</UniqueIdentifier>
    </Filter>
@@ -195,12 +180,6 @@
    <Filter Include="beast_core\thread\impl">
      <UniqueIdentifier>{91538dcf-b219-4c80-9861-bb4949089775}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast_extras">
-      <UniqueIdentifier>{2f5b95a8-1adf-4319-8464-ddc2b2e03f0b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast_extras\traits">
-      <UniqueIdentifier>{bf498396-2e1f-4903-be68-3053ba439af5}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast_asio\protocol">
      <UniqueIdentifier>{c0724499-ab69-40c3-90e2-65242dbd2eaa}</UniqueIdentifier>
    </Filter>
@@ -213,9 +192,6 @@
    <Filter Include="beast">
      <UniqueIdentifier>{92d1bb42-289a-4444-85c7-cb87540f2fff}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast\intrusive">
-      <UniqueIdentifier>{8832eb52-53f9-4850-8dc9-1d579a386a0e}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast\mpl">
      <UniqueIdentifier>{5904368f-a0f2-4d26-a031-8cbe4448dc3f}</UniqueIdentifier>
    </Filter>
@@ -255,15 +231,6 @@
    <Filter Include="beast\config">
      <UniqueIdentifier>{1fff3bd8-44ae-41df-8dd4-8bb6f07b2908}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast\crypto">
-      <UniqueIdentifier>{9c1ef4c4-5623-4500-859f-12d6ce5ae362}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast\crypto\impl">
-      <UniqueIdentifier>{fc3d3f14-9ba1-43e4-b086-cbbd2f63b944}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast\crypto\impl\sha2">
-      <UniqueIdentifier>{44489531-f44a-439a-a6ea-d32c252b1e8b}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast\chrono">
      <UniqueIdentifier>{57dc7059-cbb2-437c-9c52-79825d9a4cf5}</UniqueIdentifier>
    </Filter>
@@ -279,9 +246,6 @@
    <Filter Include="beast\config\platform">
      <UniqueIdentifier>{38c81e1f-f831-4632-af45-6340683f3346}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast\config\stdlib">
-      <UniqueIdentifier>{7243e5e5-ad7e-4d81-8444-d545919e850c}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast\smart_ptr">
      <UniqueIdentifier>{4e9c54da-1581-41d7-ac75-48140e4a13d4}</UniqueIdentifier>
    </Filter>
@@ -303,14 +267,53 @@
    <Filter Include="beast\asio\impl">
      <UniqueIdentifier>{30b0fdfb-02b6-47dd-bdd9-ffc1f57e1f2c}</UniqueIdentifier>
    </Filter>
+    <Filter Include="beast\smart_ptr\impl">
+      <UniqueIdentifier>{df4f2935-13a1-4afe-90cc-d86472ec2466}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\insight">
+      <UniqueIdentifier>{174b9125-76a7-4796-be97-79c2dcc751f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\insight\impl">
+      <UniqueIdentifier>{04f27818-7843-4ef3-967c-1761dc892342}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto">
+      <UniqueIdentifier>{9c1ef4c4-5623-4500-859f-12d6ce5ae362}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto\impl">
+      <UniqueIdentifier>{fc3d3f14-9ba1-43e4-b086-cbbd2f63b944}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\crypto\impl\sha2">
+      <UniqueIdentifier>{44489531-f44a-439a-a6ea-d32c252b1e8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\net\detail">
+      <UniqueIdentifier>{43cc0f2a-9905-4081-8104-48d2c4be9e7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\container">
+      <UniqueIdentifier>{48c7ee12-704c-42cb-99ea-9a486bb4b57e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\container\impl">
+      <UniqueIdentifier>{e30eda19-95b4-4831-b86a-ee5fae88abd2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\container\detail">
+      <UniqueIdentifier>{a4dca8cc-7d1f-4353-b7e1-15eab33e8bd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\intrusive">
+      <UniqueIdentifier>{8832eb52-53f9-4850-8dc9-1d579a386a0e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\cxx14">
+      <UniqueIdentifier>{5745a887-7df8-4059-87ea-e0c7eea77a9b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\container\tests">
+      <UniqueIdentifier>{4b468051-9e97-4548-a5f0-469425c3b603}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast\cxx14\tests">
+      <UniqueIdentifier>{1271ee71-5754-46ef-845b-84e53eed11c0}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\modules\beast_core\beast_core.h">
      <Filter>beast_core</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\AbstractFifo.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\containers\Array.h">
      <Filter>beast_core\containers</Filter>
    </ClInclude>
@@ -338,9 +341,6 @@
    <ClInclude Include="..\..\modules\beast_core\containers\ScopedValueSetter.h">
      <Filter>beast_core\containers</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\SortedSet.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\containers\SparseSet.h">
      <Filter>beast_core\containers</Filter>
    </ClInclude>
@@ -380,9 +380,6 @@
    <ClInclude Include="..\..\modules\beast_core\maths\BigInteger.h">
      <Filter>beast_core\maths</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\Expression.h">
-      <Filter>beast_core\maths</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\maths\Random.h">
      <Filter>beast_core\maths</Filter>
    </ClInclude>
@@ -395,9 +392,6 @@
    <ClInclude Include="..\..\modules\beast_core\memory\OptionalScopedPointer.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\WeakReference.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\misc\Result.h">
      <Filter>beast_core\misc</Filter>
    </ClInclude>
@@ -470,9 +464,6 @@
    <ClInclude Include="..\..\modules\beast_core\text\StringPool.h">
      <Filter>beast_core\text</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\text\TextDiff.h">
-      <Filter>beast_core\text</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\threads\ChildProcess.h">
      <Filter>beast_core\threads</Filter>
    </ClInclude>
@@ -563,21 +554,6 @@
    <ClInclude Include="..\..\modules\beast_core\memory\MemoryAlignment.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicCounter.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicFlag.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicPointer.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\AtomicState.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\LockFreeQueue.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\threads\SpinDelay.h">
      <Filter>beast_core\threads</Filter>
    </ClInclude>
@@ -587,33 +563,15 @@
    <ClInclude Include="..\..\modules\beast_core\diagnostic\Throw.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\Interval.h">
-      <Filter>beast_core\maths</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTest.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h">
-      <Filter>beast_crypto</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\containers\SharedObjectArray.h">
-      <Filter>beast_core\containers</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\files\RandomAccessFile.h">
      <Filter>beast_core\files</Filter>
    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\RecycledObjectPool.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_db\beast_db.h">
-      <Filter>beast_db</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_db\keyvalue\KeyvaDB.h">
-      <Filter>beast_db\keyvalue</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_sqlite\beast_sqlite.h">
      <Filter>beast_sqlite</Filter>
    </ClInclude>
@@ -689,9 +647,6 @@
    <ClInclude Include="..\..\modules\beast_core\diagnostic\SemanticVersion.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\maths\uint24.h">
-      <Filter>beast_core\maths</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\diagnostic\MeasureFunctionCallTime.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
@@ -719,18 +674,12 @@
    <ClInclude Include="..\..\modules\beast_core\thread\DeadlineTimer.h">
      <Filter>beast_core\thread</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\thread\Semaphore.h">
-      <Filter>beast_core\thread</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\thread\Workers.h">
      <Filter>beast_core\thread</Filter>
    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\maths\Math.h">
      <Filter>beast_core\maths</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapperStrand.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_asio\basics\SSLContext.h">
      <Filter>beast_asio\basics</Filter>
    </ClInclude>
@@ -740,12 +689,6 @@
    <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h">
      <Filter>beast_asio\system</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_extras\traits\BoostLockableTraits.h">
-      <Filter>beast_extras\traits</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_extras\beast_extras.h">
-      <Filter>beast_extras</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\system\BeforeBoost.h">
      <Filter>beast_core\system</Filter>
    </ClInclude>
@@ -764,60 +707,12 @@
    <ClInclude Include="..\..\modules\beast_core\system\SystemStats.h">
      <Filter>beast_core\system</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\intrusive\ForwardList.h">
-      <Filter>beast\intrusive</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\intrusive\PointerTraits.h">
-      <Filter>beast\intrusive</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\RemoveConst.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\RemoveReference.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\RemoveVolatile.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\AddConst.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\PointerToOther.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerAllocator.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerPtr.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerType.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h">
      <Filter>beast_asio\basics</Filter>
    </ClInclude>
    <ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h">
      <Filter>beast_asio\basics</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\Socket.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketBase.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapper.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_asio\system\OpenSSLIncludes.h">
      <Filter>beast_asio\system</Filter>
    </ClInclude>
@@ -902,12 +797,6 @@
    <ClInclude Include="..\..\modules\beast_asio\http\HTTPParserImpl.h">
      <Filter>beast_asio\http</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\IfCond.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\BuffersType.h">
-      <Filter>beast_asio\basics</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
@@ -920,18 +809,6 @@
    <ClInclude Include="..\..\modules\beast_core\diagnostic\FatalError.h">
      <Filter>beast_core\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h">
-      <Filter>beast_crypto\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_crypto\math\UnsignedIntegerCalc.h">
-      <Filter>beast_crypto\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_crypto\math\BinaryEncoding.h">
-      <Filter>beast_crypto\math</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\Config.h">
      <Filter>beast</Filter>
    </ClInclude>
@@ -956,12 +833,6 @@
    <ClInclude Include="..\..\beast\type_traits\IsIntegral.h">
      <Filter>beast\type_traits</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\type_traits\RemoveSigned.h">
-      <Filter>beast\type_traits</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\utility\EnableIf.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\utility\Journal.h">
      <Filter>beast\utility</Filter>
    </ClInclude>
@@ -992,12 +863,6 @@
    <ClInclude Include="..\..\beast\intrusive\LockFreeStack.h">
      <Filter>beast\intrusive</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\intrusive\List.h">
-      <Filter>beast\intrusive</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\CopyConst.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\http\impl\http-parser\http_parser.h">
      <Filter>beast\http\impl\http-parser</Filter>
    </ClInclude>
@@ -1079,9 +944,6 @@
    <ClInclude Include="..\..\beast\FixedArray.h">
      <Filter>beast</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\intrusive\IntrusiveArray.h">
-      <Filter>beast\intrusive</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\Crypto.h">
      <Filter>beast</Filter>
    </ClInclude>
@@ -1091,18 +953,9 @@
    <ClInclude Include="..\..\beast\crypto\Sha256.h">
      <Filter>beast\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\WrapHandler.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\AbstractHandler.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\Chrono.h">
      <Filter>beast</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\chrono\RelativeTime.h">
-      <Filter>beast\chrono</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\SafeBool.h">
      <Filter>beast</Filter>
    </ClInclude>
@@ -1170,12 +1023,6 @@
    <ClInclude Include="..\..\modules\beast_asio\http\HTTPResponseParser.h">
      <Filter>beast_asio\http</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\chrono\ScopedTimeInterval.h">
-      <Filter>beast\chrono</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\chrono\CPUMeter.h">
-      <Filter>beast\chrono</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\smart_ptr\SharedObject.h">
      <Filter>beast\smart_ptr</Filter>
    </ClInclude>
@@ -1248,12 +1095,6 @@
    <ClInclude Include="..\..\beast\threads\ScopedWrapperContext.h">
      <Filter>beast\threads</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\beast\utility\BaseFromMember.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\beast\net\IPAddress.h">
-      <Filter>beast\net</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\beast\Asio.h">
      <Filter>beast</Filter>
    </ClInclude>
@@ -1263,11 +1104,227 @@
    <ClInclude Include="..\..\beast\crypto\MurmurHash.h">
      <Filter>beast\crypto</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\beast\smart_ptr\AbstractObject.h">
+      <Filter>beast\smart_ptr</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\Insight.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Collector.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Counter.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\CounterImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Event.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\EventImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Gauge.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\GaugeImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Meter.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\MeterImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\NullCollector.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\StatsDCollector.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Hook.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\HookImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cyclic_iterator.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\threads\semaphore.h">
+      <Filter>beast\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\intrusive\List.h">
+      <Filter>beast\intrusive</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\crypto\BinaryEncoding.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\crypto\UnsignedInteger.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\crypto\UnsignedIntegerCalc.h">
+      <Filter>beast\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\hash_pair.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\io_latency_probe.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Base.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\BaseImpl.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Group.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\insight\Groups.h">
+      <Filter>beast\insight</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\detail\Parse.h">
+      <Filter>beast\net\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\IPAddress.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\IPAddressV4.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\IPAddressV6.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\net\IPEndpoint.h">
+      <Filter>beast\net</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\abstract_clock.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\basic_seconds_clock.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\chrono_io.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\chrono_util.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\CPUMeter.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\manual_clock.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\ratio_io.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\RelativeTime.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\chrono\ScopedTimeInterval.h">
+      <Filter>beast\chrono</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\type_traits\maybe_const.h">
+      <Filter>beast\type_traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\utility\empty_base_optimization.h">
+      <Filter>beast\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\detail\aged_associative_container.h">
+      <Filter>beast\container\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\detail\aged_container_iterator.h">
+      <Filter>beast\container\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_map.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_multimap.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_multiset.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_set.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_unordered_map.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_unordered_multimap.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_unordered_multiset.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_unordered_set.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\detail\aged_ordered_container.h">
+      <Filter>beast\container\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\detail\aged_unordered_container.h">
+      <Filter>beast\container\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\detail\aged_associative_container.h">
+      <Filter>beast\container\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_container_utility.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\aged_container.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\type_traits.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\functional.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\config.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\algorithm.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\memory.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\container\buffer_view.h">
+      <Filter>beast\container</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\cxx14\utility.h">
+      <Filter>beast\cxx14</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\abstract_socket.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\bind_handler.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\buffer_sequence.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\placeholders.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\shared_handler.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\socket_wrapper.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\asio\wrap_handler.h">
+      <Filter>beast\asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\http\impl\http_parser.h">
+      <Filter>beast\http\impl</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
-      <Filter>beast_core\containers</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\containers\DynamicObject.cpp">
      <Filter>beast_core\containers</Filter>
    </ClCompile>
@@ -1310,9 +1367,6 @@
    <ClCompile Include="..\..\modules\beast_core\maths\BigInteger.cpp">
      <Filter>beast_core\maths</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\maths\Expression.cpp">
-      <Filter>beast_core\maths</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\maths\Random.cpp">
      <Filter>beast_core\maths</Filter>
    </ClCompile>
@@ -1415,9 +1469,6 @@
    <ClCompile Include="..\..\modules\beast_core\text\StringPool.cpp">
      <Filter>beast_core\text</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\text\TextDiff.cpp">
-      <Filter>beast_core\text</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\threads\ChildProcess.cpp">
      <Filter>beast_core\threads</Filter>
    </ClCompile>
@@ -1514,12 +1565,6 @@
    <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.cpp">
      <Filter>beast_core\diagnostic</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_db\beast_db.cpp">
-      <Filter>beast_db</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_db\keyvalue\KeyvaDB.cpp">
-      <Filter>beast_db\keyvalue</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.c">
      <Filter>beast_sqlite</Filter>
    </ClCompile>
@@ -1577,9 +1622,6 @@
    <ClCompile Include="..\..\modules\beast_core\thread\DeadlineTimer.cpp">
      <Filter>beast_core\thread</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\thread\Semaphore.cpp">
-      <Filter>beast_core\thread</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\thread\Workers.cpp">
      <Filter>beast_core\thread</Filter>
    </ClCompile>
@@ -1592,18 +1634,9 @@
    <ClCompile Include="..\..\modules\beast_core\system\SystemStats.cpp">
      <Filter>beast_core\system</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
-      <Filter>beast_asio\async</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_asio\basics\PeerRole.cpp">
      <Filter>beast_asio\basics</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\Socket.cpp">
-      <Filter>beast_asio\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\SocketBase.cpp">
-      <Filter>beast_asio\sockets</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_asio\system\BoostUnitTests.cpp">
      <Filter>beast_asio\system</Filter>
    </ClCompile>
@@ -1658,9 +1691,6 @@
    <ClCompile Include="..\..\modules\beast_asio\http\HTTPParser.cpp">
      <Filter>beast_asio\http</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp">
-      <Filter>beast_crypto</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
      <Filter>beast_core</Filter>
    </ClCompile>
@@ -1676,15 +1706,6 @@
    <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
      <Filter>beast_core\diagnostic</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
-      <Filter>beast_crypto\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_crypto\math\BinaryEncoding.cpp">
-      <Filter>beast_crypto\math</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp">
-      <Filter>beast_extras</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\beast\net\Net.cpp">
      <Filter>beast\net</Filter>
    </ClCompile>
@@ -1748,9 +1769,6 @@
    <ClCompile Include="..\..\beast\chrono\impl\RelativeTime.cpp">
      <Filter>beast\chrono\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\beast\chrono\Chrono.cpp">
-      <Filter>beast\chrono</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\beast\utility\impl\Debug.cpp">
      <Filter>beast\utility\impl</Filter>
    </ClCompile>
@@ -1805,9 +1823,6 @@
    <ClCompile Include="..\..\beast\utility\impl\PropertyStream.cpp">
      <Filter>beast\utility\impl</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\beast\net\impl\IPAddress.cpp">
-      <Filter>beast\net\impl</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\beast\asio\Asio.cpp">
      <Filter>beast\asio</Filter>
    </ClCompile>
@@ -1817,6 +1832,84 @@
    <ClCompile Include="..\..\beast\crypto\impl\MurmurHash.cpp">
      <Filter>beast\crypto\impl</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\beast\smart_ptr\impl\AbstractObject.cpp">
+      <Filter>beast\smart_ptr\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\Insight.cpp">
+      <Filter>beast\insight</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Collector.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Metric.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\NullCollector.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\StatsDCollector.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Hook.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\abstract_clock.cpp">
+      <Filter>beast\chrono\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\chrono_io.cpp">
+      <Filter>beast\chrono\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\BinaryEncoding.cpp">
+      <Filter>beast\crypto\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\impl\UnsignedInteger.cpp">
+      <Filter>beast\crypto\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Group.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\impl\Groups.cpp">
+      <Filter>beast\insight\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPAddress.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPAddressV4.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPAddressV6.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
+      <Filter>beast\net\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\impl\Assert.cpp">
+      <Filter>beast\utility\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\Chrono.cpp">
+      <Filter>beast\chrono</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\impl\basic_seconds_clock.cpp">
+      <Filter>beast\chrono\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\container\Container.cpp">
+      <Filter>beast\container</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\container\impl\aged_associative_container.cpp">
+      <Filter>beast\container\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\container\tests\buffer_view.test.cpp">
+      <Filter>beast\container\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\cxx14\cxx14.cpp">
+      <Filter>beast\cxx14</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\cxx14\tests\integer_sequence.test.cpp">
+      <Filter>beast\cxx14\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\asio\abstract_socket.cpp">
+      <Filter>beast\asio</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <Text Include="..\..\TODO.txt">
--- a/src/beast/TODO.txt
+++ b/src/beast/TODO.txt
@@ -52,8 +52,6 @@ BEAST TODO

 - Rename include guards to boost style, e.g. BEAST_THROW_H_INCLUDED

- Decide if we should get rid of AtomicCounter, AtomicFlag, AtomicPointer, AtomicState
-
 - Clean up CacheLine, StaticObject

 - Clean up ConcurrentObject
--- a/src/beast/beast/Asio.h
+++ b/src/beast/beast/Asio.h
@@ -20,6 +20,4 @@
 #ifndef BEAST_ASIO_H_INCLUDED
 #define BEAST_ASIO_H_INCLUDED

-#include "asio/IPAddressConversion.h"
-
 #endif
--- a/src/beast/beast/Atomic.h
+++ b/src/beast/beast/Atomic.h
@@ -207,6 +207,9 @@ private:
    #define BEAST_64BIT_ATOMICS_UNAVAILABLE 1
  #endif

+#elif BEAST_CLANG && BEAST_LINUX
+  #define BEAST_ATOMICS_GCC 1
+
 //==============================================================================
 #elif BEAST_GCC
  #define BEAST_ATOMICS_GCC 1        // GCC with intrinsics
@@ -297,8 +300,16 @@ template <typename Type>
 inline Type Atomic<Type>::operator+= (const Type amountToAdd) noexcept
 {
  #if BEAST_ATOMICS_MAC
+#   ifdef __clang__
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"
+#       pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#   endif
    return sizeof (Type) == 4 ? (Type) OSAtomicAdd32Barrier ((int32_t) castTo32Bit (amountToAdd), (BEAST_MAC_ATOMICS_VOLATILE int32_t*) &value)
                              : (Type) OSAtomicAdd64Barrier ((int64_t) amountToAdd, (BEAST_MAC_ATOMICS_VOLATILE int64_t*) &value);
+#   ifdef __clang__
+#       pragma clang diagnostic pop
+#   endif
  #elif BEAST_ATOMICS_WINDOWS
    return sizeof (Type) == 4 ? (Type) (beast_InterlockedExchangeAdd ((volatile long*) &value, (long) amountToAdd) + (long) amountToAdd)
                              : (Type) (beast_InterlockedExchangeAdd64 ((volatile __int64*) &value, (__int64) amountToAdd) + (__int64) amountToAdd);
@@ -317,13 +328,21 @@ template <typename Type>
 inline Type Atomic<Type>::operator++() noexcept
 {
  #if BEAST_ATOMICS_MAC
+#   ifdef __clang__
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"
+#       pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#   endif
    return sizeof (Type) == 4 ? (Type) OSAtomicIncrement32Barrier ((BEAST_MAC_ATOMICS_VOLATILE int32_t*) &value)
                              : (Type) OSAtomicIncrement64Barrier ((BEAST_MAC_ATOMICS_VOLATILE int64_t*) &value);
+#   ifdef __clang__
+#       pragma clang diagnostic pop
+#   endif
  #elif BEAST_ATOMICS_WINDOWS
    return sizeof (Type) == 4 ? (Type) beast_InterlockedIncrement ((volatile long*) &value)
                              : (Type) beast_InterlockedIncrement64 ((volatile __int64*) &value);
  #elif BEAST_ATOMICS_GCC
-    return (Type) __sync_add_and_fetch (&value, 1);
+    return (Type) __sync_add_and_fetch (&value, (Type) 1);
  #endif
 }

@@ -331,13 +350,21 @@ template <typename Type>
 inline Type Atomic<Type>::operator--() noexcept
 {
  #if BEAST_ATOMICS_MAC
+#   ifdef __clang__
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wint-to-void-pointer-cast"
+#       pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#   endif
    return sizeof (Type) == 4 ? (Type) OSAtomicDecrement32Barrier ((BEAST_MAC_ATOMICS_VOLATILE int32_t*) &value)
                              : (Type) OSAtomicDecrement64Barrier ((BEAST_MAC_ATOMICS_VOLATILE int64_t*) &value);
+#   ifdef __clang__
+#       pragma clang diagnostic pop
+#   endif
  #elif BEAST_ATOMICS_WINDOWS
    return sizeof (Type) == 4 ? (Type) beast_InterlockedDecrement ((volatile long*) &value)
                              : (Type) beast_InterlockedDecrement64 ((volatile __int64*) &value);
  #elif BEAST_ATOMICS_GCC
-    return (Type) __sync_add_and_fetch (&value, -1);
+    return (Type) __sync_add_and_fetch (&value, (Type) -1);
  #endif
 }

--- a/src/beast/beast/Boost.h
+++ b/src/beast/beast/Boost.h
@@ -3,10 +3,6 @@
    This file is part of Beast: https://github.com/vinniefalco/Beast
    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>

-    Portions of this file are from JUCE.
-    Copyright (c) 2013 - Raw Material Software Ltd.
-    Please visit http://www.juce.com
-
    Permission to use, copy, modify, and/or distribute this software for any
    purpose  with  or without fee is hereby granted, provided that the above
    copyright notice and this permission notice appear in all copies.
--- a/src/beast/beast/Chrono.h
+++ b/src/beast/beast/Chrono.h
@@ -20,6 +20,13 @@
 #ifndef BEAST_CHRONO_H_INCLUDED
 #define BEAST_CHRONO_H_INCLUDED

+#include "chrono/abstract_clock.h"
+#include "chrono/basic_seconds_clock.h"
+#include "chrono/chrono_io.h"
+#include "chrono/chrono_util.h"
+#include "chrono/manual_clock.h"
+#include "chrono/ratio_io.h"
+
 #include "chrono/CPUMeter.h"
 #include "chrono/RelativeTime.h"
 #include "chrono/ScopedTimeInterval.h"
--- a/src/beast/beast/Crypto.h
+++ b/src/beast/beast/Crypto.h
@@ -20,8 +20,11 @@
 #ifndef BEAST_CRYPTO_H_INCLUDED
 #define BEAST_CRYPTO_H_INCLUDED

+#include "crypto/BinaryEncoding.h"
 #include "crypto/MurmurHash.h"
 #include "crypto/Sha256.h"
+#include "crypto/UnsignedInteger.h"
+#include "crypto/UnsignedIntegerCalc.h"

 #endif

--- a/src/beast/beast/FixedArray.h
+++ b/src/beast/beast/FixedArray.h
@@ -139,7 +139,8 @@ bool operator!= (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
 template <class T, std::size_t N>
 bool operator< (FixedArray <T, N> const& lhs, FixedArray <T, N> const& rhs)
 {
-    return std::lexicographical_compare (lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
+    return std::lexicographical_compare (
+        lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
 }

 template <class T, std::size_t N>
--- a/src/beast/beast/Insight.h
+++ b/src/beast/beast/Insight.h
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_INSIGHT_H_INCLUDED
+#define BEAST_INSIGHT_H_INCLUDED
+
+#include "insight/Counter.h"
+#include "insight/CounterImpl.h"
+#include "insight/Event.h"
+#include "insight/EventImpl.h"
+#include "insight/Gauge.h"
+#include "insight/GaugeImpl.h"
+#include "insight/Group.h"
+#include "insight/Groups.h"
+#include "insight/Hook.h"
+#include "insight/HookImpl.h"
+#include "insight/Collector.h"
+#include "insight/NullCollector.h"
+#include "insight/StatsDCollector.h"
+
+#endif
--- a/src/beast/beast/Intrusive.h
+++ b/src/beast/beast/Intrusive.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_INTRUSIVE_H_INCLUDED
 #define BEAST_INTRUSIVE_H_INCLUDED

-#include "intrusive/ForwardList.h"
-#include "intrusive/IntrusiveArray.h"
 #include "intrusive/List.h"
 #include "intrusive/LockFreeStack.h"

--- a/src/beast/beast/MPL.h
+++ b/src/beast/beast/MPL.h
@@ -20,14 +20,6 @@
 #ifndef BEAST_MPL_H_INCLUDED
 #define BEAST_MPL_H_INCLUDED

-#include "mpl/AddConst.h"
-#include "mpl/CopyConst.h"
-#include "mpl/IfCond.h"
 #include "mpl/IsCallPossible.h"
-#include "mpl/PointerToOther.h"
-#include "mpl/RemoveConst.h"
-#include "mpl/RemoveConstVolatile.h"
-#include "mpl/RemoveReference.h"
-#include "mpl/RemoveVolatile.h"

 #endif
--- a/src/beast/beast/Memory.h
+++ b/src/beast/beast/Memory.h
@@ -27,6 +27,7 @@
 #include <cstring>
    
 #include "Config.h"
+#include "Uncopyable.h"

 namespace beast {

--- a/src/beast/beast/Net.h
+++ b/src/beast/beast/Net.h
@@ -23,6 +23,9 @@
 #include "net/BufferType.h"
 #include "net/DynamicBuffer.h"

-#include "net/IPAddress.h"
+#include "net/IPEndpoint.h"
+#include "net/IPAddressV4.h"
+#include "net/IPAddressV6.h"
+#include "net/IPEndpoint.h"

 #endif
--- a/src/beast/beast/SmartPtr.h
+++ b/src/beast/beast/SmartPtr.h
@@ -22,6 +22,7 @@

 #include "Config.h"

+#include "smart_ptr/AbstractObject.h"
 #include "smart_ptr/ContainerDeletePolicy.h"
 #include "smart_ptr/SharedObject.h"
 #include "smart_ptr/SharedPtr.h"
--- a/src/beast/beast/Threads.h
+++ b/src/beast/beast/Threads.h
@@ -34,4 +34,6 @@
 #include "threads/WaitableEvent.h"
 #include "threads/ScopedWrapperContext.h"

+#include "threads/semaphore.h"
+
 #endif
--- a/src/beast/beast/TypeTraits.h
+++ b/src/beast/beast/TypeTraits.h
@@ -23,6 +23,5 @@
 #include "type_traits/IntegralConstant.h"
 #include "type_traits/IsIntegral.h"
 #include "type_traits/IsSigned.h"
-#include "type_traits/RemoveSigned.h"

 #endif
--- a/src/beast/beast/Utility.h
+++ b/src/beast/beast/Utility.h
@@ -20,14 +20,14 @@
 #ifndef BEAST_UTILITY_H_INCLUDED
 #define BEAST_UTILITY_H_INCLUDED

-#include "utility/BaseFromMember.h"
 #include "utility/Debug.h"
-#include "utility/EnableIf.h"
 #include "utility/Error.h"
 #include "utility/Journal.h"
 #include "utility/LeakChecked.h"
 #include "utility/PropertyStream.h"
 #include "utility/StaticObject.h"

+#include "utility/hash_pair.h"
+
 #endif

--- a/src/beast/beast/asio/Asio.cpp
+++ b/src/beast/beast/asio/Asio.cpp
@@ -20,3 +20,9 @@
 #include "BeastConfig.h"

 #include "impl/IPAddressConversion.cpp"
+
+#include "tests/wrap_handler_tests.cpp"
+#include "tests/bind_handler_tests.cpp"
+#include "tests/shared_handler_tests.cpp"
+
+#include "abstract_socket.cpp" // TEMPORARY!
--- a/src/beast/beast/asio/IPAddressConversion.h
+++ b/src/beast/beast/asio/IPAddressConversion.h
@@ -20,41 +20,47 @@
 #ifndef BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED
 #define BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED

-#include "../net/IPAddress.h"
+#include "../net/IPEndpoint.h"

 #include <sstream>

 #include <boost/asio.hpp>

 namespace beast {
+namespace IP {

+/** Convert to Endpoint.
+    The port is set to zero.
+*/
+Endpoint from_asio (boost::asio::ip::address const& address);
+
+/** Convert to Endpoint. */
+Endpoint from_asio (boost::asio::ip::tcp::endpoint const& endpoint);
+
+/** Convert to asio::ip::address.
+    The port is ignored.
+*/
+boost::asio::ip::address to_asio_address (Endpoint const& endpoint);
+
+/** Convert to asio::ip::tcp::endpoint. */
+boost::asio::ip::tcp::endpoint to_asio_endpoint (Endpoint const& endpoint);
+
+}
+}
+
+namespace beast {
+
+// DEPRECATED
 struct IPAddressConversion
 {
-    /** Convert to IPAddress.
-        The port is set to zero.
-    */
-    static IPAddress from_asio (boost::asio::ip::address const& address);
-
-    /** Convert to IPAddress, including port. */
-    static IPAddress from_asio (boost::asio::ip::tcp::endpoint const& endpoint);
-
-    /** Convert to asio::ip::address.
-        The port is ignored.
-    */
-    static boost::asio::ip::address to_asio_address (IPAddress const& address);
-
-    /** Convert to asio::ip::tcp::endpoint. */
-    static boost::asio::ip::tcp::endpoint to_asio_endpoint (IPAddress const& address);
-
-    /** Conversions to string. */
-    /** @{ */
-    static std::string to_string (boost::asio::ip::tcp::endpoint const& endpoint)
-    {
-        std::stringstream ss;
-        ss << endpoint;
-        return ss.str();
-    }
-    /** @} */
+    static IP::Endpoint from_asio (boost::asio::ip::address const& address)
+        { return IP::from_asio (address); }
+    static IP::Endpoint from_asio (boost::asio::ip::tcp::endpoint const& endpoint)
+        { return IP::from_asio (endpoint); }
+    static boost::asio::ip::address to_asio_address (IP::Endpoint const& address)
+        { return IP::to_asio_address (address); }
+    static boost::asio::ip::tcp::endpoint to_asio_endpoint (IP::Endpoint const& address)
+        { return IP::to_asio_endpoint (address); }
 };

 }
--- a/src/beast/beast/asio/abstract_socket.cpp
+++ b/src/beast/beast/asio/abstract_socket.cpp
@@ -0,0 +1,217 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "abstract_socket.h"
+#include "bind_handler.h"
+
+namespace beast {
+namespace asio {
+
+#if ! BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES
+
+//------------------------------------------------------------------------------
+//
+// Socket
+//
+//------------------------------------------------------------------------------
+
+void* abstract_socket::this_layer_ptr (char const*) const
+{
+    pure_virtual_called ();
+    return nullptr;
+}
+
+//------------------------------------------------------------------------------
+//
+// native_handle
+//
+//------------------------------------------------------------------------------
+
+bool abstract_socket::native_handle (char const*, void*)
+{
+    pure_virtual_called ();
+    return false;
+}
+
+//------------------------------------------------------------------------------
+//
+// basic_io_object
+//
+//------------------------------------------------------------------------------
+
+boost::asio::io_service& abstract_socket::get_io_service ()
+{
+    pure_virtual_called ();
+    return *static_cast <boost::asio::io_service*>(nullptr);
+}
+
+//------------------------------------------------------------------------------
+//
+// basic_socket
+//
+//------------------------------------------------------------------------------
+
+void*
+abstract_socket::lowest_layer_ptr (char const*) const
+{
+    pure_virtual_called ();
+    return nullptr;
+}
+
+auto
+abstract_socket::cancel (boost::system::error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+auto
+abstract_socket::shutdown (shutdown_type, boost::system::error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+auto
+abstract_socket::close (boost::system::error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+//------------------------------------------------------------------------------
+//
+// basic_socket_acceptor
+//
+//------------------------------------------------------------------------------
+
+auto 
+abstract_socket::accept (abstract_socket&, error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+void
+abstract_socket::async_accept (abstract_socket&, error_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error()));
+}
+
+//------------------------------------------------------------------------------
+//
+// basic_stream_socket
+//
+//------------------------------------------------------------------------------
+
+std::size_t
+abstract_socket::read_some (mutable_buffers, error_code& ec)
+{
+    ec = pure_virtual_error ();
+    return 0;
+}
+
+std::size_t
+abstract_socket::write_some (const_buffers, error_code& ec)
+{
+    ec = pure_virtual_error ();
+    return 0;
+}
+
+void
+abstract_socket::async_read_some (mutable_buffers, transfer_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error(), 0));
+}
+
+void
+abstract_socket::async_write_some (const_buffers, transfer_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error(), 0));
+}
+
+//------------------------------------------------------------------------------
+//
+// ssl::stream
+//
+//------------------------------------------------------------------------------
+
+void*
+abstract_socket::next_layer_ptr (char const*) const
+{
+    pure_virtual_called ();
+    return nullptr;
+}
+
+bool
+abstract_socket::needs_handshake ()
+{
+    return false;
+}
+
+void
+abstract_socket::set_verify_mode (int)
+{
+    pure_virtual_called ();
+}
+
+auto
+abstract_socket::handshake (handshake_type, error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+void
+abstract_socket::async_handshake (handshake_type, error_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error()));
+}
+
+auto
+abstract_socket::handshake (handshake_type, const_buffers, error_code& ec) ->
+    error_code
+{
+    return pure_virtual_error (ec);
+}
+
+void
+abstract_socket::async_handshake (handshake_type, const_buffers,
+    transfer_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error(), 0));
+}
+
+auto
+abstract_socket::shutdown (error_code& ec) -> error_code
+{
+    return pure_virtual_error (ec);
+}
+
+void
+abstract_socket::async_shutdown (error_handler handler)
+{
+    get_io_service ().post (bind_handler (
+        handler, pure_virtual_error()));
+}
+
+#endif
+
+}
+}
--- a/src/beast/modules/beast_asio/sockets/Socket.h
+++ b/src/beast/modules/beast_asio/sockets/Socket.h
@@ -17,8 +17,28 @@
 */
 //==============================================================================

-#ifndef BEAST_ASIO_SOCKETS_SOCKET_H_INCLUDED
-#define BEAST_ASIO_SOCKETS_SOCKET_H_INCLUDED
+#ifndef BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
+#define BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED
+
+#include "buffer_sequence.h"
+#include "shared_handler.h"
+
+#include <boost/asio/socket_base.hpp>
+#include <boost/asio/ssl/stream_base.hpp>
+
+// Checking overrides replaces unimplemented stubs with pure virtuals
+#ifndef BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES
+# define BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES 1
+#endif
+
+#if BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES
+# define BEAST_SOCKET_VIRTUAL = 0
+#else
+# define BEAST_SOCKET_VIRTUAL
+#endif
+
+namespace beast {
+namespace asio {

 /** A high level socket abstraction.

@@ -29,18 +49,61 @@
    When member functions are called and the underlying implementation does
    not support the operation, a fatal error is generated.
 */
-class Socket
-    : public SocketBase
-    , public boost::asio::ssl::stream_base
+class abstract_socket
+    : public boost::asio::ssl::stream_base
    , public boost::asio::socket_base
 {
+protected:
+    typedef boost::system::error_code error_code;
+
+    typedef asio::shared_handler <void (void)> post_handler;
+
+    typedef asio::shared_handler <void (error_code)> error_handler;
+
+    typedef asio::shared_handler <
+        void (error_code, std::size_t)> transfer_handler;
+
+    static
+    void
+    pure_virtual_called()
+    {
+        throw std::runtime_error ("pure virtual called");
+    }
+
+    static
+    error_code
+    pure_virtual_error ()
+    {
+        pure_virtual_called();
+        return boost::system::errc::make_error_code (
+            boost::system::errc::function_not_supported);
+    }
+
+    static
+    error_code
+    pure_virtual_error (error_code& ec)
+    {
+        return ec = pure_virtual_error();
+    }
+
+    static
+    void
+    throw_if (error_code const& ec)
+    {
+        if (ec)
+            throw boost::system::system_error (ec);
+    }
+
 public:
-    virtual ~Socket ();
+    virtual ~abstract_socket ()
+    {
+    }

    //--------------------------------------------------------------------------
    //
-    // Socket
+    // abstract_socket
    //
+    //--------------------------------------------------------------------------

    /** Retrieve the underlying object.

@@ -48,32 +111,32 @@ public:
              exception is thrown if trying to acquire a reference.
    */
    /** @{ */
-    template <typename Object>
+    template <class Object>
    Object& this_layer ()
    {
        Object* object (this->this_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object const& this_layer () const
    {
        Object const* object (this->this_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object* this_layer_ptr ()
    {
        return static_cast <Object*> (
            this->this_layer_ptr (typeid (Object).name ()));
    }

-    template <typename Object>
+    template <class Object>
    Object const* this_layer_ptr () const
    {
        return static_cast <Object const*> (
@@ -88,6 +151,7 @@ public:
    //
    // native_handle
    //
+    //--------------------------------------------------------------------------

    /** Retrieve the native representation of the object.

@@ -101,7 +165,7 @@ public:
    void native_handle (Handle* dest)
    {
        if (! native_handle (typeid (Handle).name (), dest))
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
    }

    virtual bool native_handle (char const* type_name, void* dest)
@@ -111,6 +175,7 @@ public:
    //
    // basic_io_object
    //
+    //--------------------------------------------------------------------------

    virtual boost::asio::io_service& get_io_service ()
        BEAST_SOCKET_VIRTUAL;
@@ -119,6 +184,7 @@ public:
    //
    // basic_socket
    //
+    //--------------------------------------------------------------------------

    /** Retrieve the lowest layer object.

@@ -126,32 +192,32 @@ public:
              exception is thrown if trying to acquire a reference.
    */
    /** @{ */
-    template <typename Object>
+    template <class Object>
    Object& lowest_layer ()
    {
        Object* object (this->lowest_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object const& lowest_layer () const
    {
        Object const* object (this->lowest_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object* lowest_layer_ptr ()
    {
        return static_cast <Object*> (
            this->lowest_layer_ptr (typeid (Object).name ()));
    }

-    template <typename Object>
+    template <class Object>
    Object const* lowest_layer_ptr () const
    {
        return static_cast <Object const*> (
@@ -167,7 +233,8 @@ public:
    void cancel ()
    {
        error_code ec;
-        throw_error (cancel (ec), __FILE__, __LINE__);
+        cancel (ec);
+        throw_if (ec);
    }

    virtual error_code cancel (error_code& ec)
@@ -176,7 +243,8 @@ public:
    void shutdown (shutdown_type what)
    {
        error_code ec;
-        throw_error (shutdown (what, ec), __FILE__, __LINE__);
+        shutdown (what, ec);
+        throw_if (ec);
    }

    virtual error_code shutdown (shutdown_type what,
@@ -186,7 +254,8 @@ public:
    void close ()
    {
        error_code ec;
-        throw_error (close (ec), __FILE__, __LINE__);
+        close (ec);
+        throw_if (ec);
    }

    virtual error_code close (error_code& ec)
@@ -196,82 +265,39 @@ public:
    //
    // basic_socket_acceptor
    //
+    //--------------------------------------------------------------------------

-    virtual error_code accept (Socket& peer, error_code& ec)
+    virtual error_code accept (abstract_socket& peer, error_code& ec)
        BEAST_SOCKET_VIRTUAL;

-    template <typename AcceptHandler>
-    void async_accept (Socket& peer, BOOST_ASIO_MOVE_ARG(AcceptHandler) handler)
-    {
-        return async_accept (peer,
-            newAcceptHandler (BOOST_ASIO_MOVE_CAST(AcceptHandler)(handler)));
-    }
-
-    virtual void async_accept (Socket& peer, SharedHandlerPtr handler)
+    virtual void async_accept (abstract_socket& peer, error_handler handler)
        BEAST_SOCKET_VIRTUAL;

    //--------------------------------------------------------------------------
    //
    // basic_stream_socket
    //
+    //--------------------------------------------------------------------------

-    // SyncReadStream
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/SyncReadStream.html
-    //
-    template <typename MutableBufferSequence>
-    std::size_t read_some (MutableBufferSequence const& buffers,
-        error_code& ec)
-    {
-        return read_some (MutableBuffers (buffers), ec);
-    }
-
-    virtual std::size_t read_some (MutableBuffers const& buffers, error_code& ec)
+    virtual std::size_t read_some (mutable_buffers buffers, error_code& ec)
        BEAST_SOCKET_VIRTUAL;

-    // SyncWriteStream
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/SyncWriteStream.html
-    //
-    template <typename ConstBufferSequence>
-    std::size_t write_some (ConstBufferSequence const& buffers, error_code &ec)
-    {
-        return write_some (ConstBuffers (buffers), ec);
-    }
-
-    virtual std::size_t write_some (ConstBuffers const& buffers, error_code& ec)
+    virtual std::size_t write_some (const_buffers buffers, error_code& ec)
        BEAST_SOCKET_VIRTUAL;

-    // AsyncReadStream
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/AsyncReadStream.html
-    //
-    template <typename MutableBufferSequence, typename ReadHandler>
-    void async_read_some (MutableBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
-    {
-        return async_read_some (MutableBuffers (buffers),
-            newReadHandler (BOOST_ASIO_MOVE_CAST(ReadHandler)(handler)));
-    }
-
-    virtual void async_read_some (MutableBuffers const& buffers, SharedHandlerPtr handler)
+    virtual void async_read_some (mutable_buffers buffers,
+        transfer_handler handler)
        BEAST_SOCKET_VIRTUAL;

-    // AsyncWriteStream
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/AsyncWriteStream.html
-    //
-    template <typename ConstBufferSequence, typename WriteHandler>
-    void async_write_some (ConstBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
-    {
-        return async_write_some (ConstBuffers (buffers),
-            newWriteHandler (BOOST_ASIO_MOVE_CAST(WriteHandler)(handler)));
-    }
-
-    virtual void async_write_some (ConstBuffers const& buffers, SharedHandlerPtr handler)
+    virtual void async_write_some (const_buffers buffers,
+        transfer_handler handler)
        BEAST_SOCKET_VIRTUAL;

    //--------------------------------------------------------------------------
    //
    // ssl::stream
    //
+    //--------------------------------------------------------------------------

    /** Retrieve the next layer object.

@@ -279,32 +305,32 @@ public:
              exception is thrown if trying to acquire a reference.
    */
    /** @{ */
-    template <typename Object>
+    template <class Object>
    Object& next_layer ()
    {
        Object* object (this->next_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object const& next_layer () const
    {
        Object const* object (this->next_layer_ptr <Object> ());
        if (object == nullptr)
-            Throw (std::bad_cast (), __FILE__, __LINE__);
+            throw std::bad_cast ();
        return *object;
    }

-    template <typename Object>
+    template <class Object>
    Object* next_layer_ptr ()
    {
        return static_cast <Object*> (
            this->next_layer_ptr (typeid (Object).name ()));
    }

-    template <typename Object>
+    template <class Object>
    Object const* next_layer_ptr () const
    {
        return static_cast <Object const*> (
@@ -330,107 +356,49 @@ public:
    virtual bool needs_handshake ()
        BEAST_SOCKET_VIRTUAL;

-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__verify_mode.html
-    //
-    virtual void set_verify_mode (int verify_mode) = 0;
+    virtual void set_verify_mode (int verify_mode)
+        BEAST_SOCKET_VIRTUAL;

-    // ssl::stream::handshake (1 of 4)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/handshake/overload1.html
-    //
    void handshake (handshake_type type)
    {
        error_code ec;
-        throw_error (handshake (type, ec), __FILE__, __LINE__);
+        handshake (type, ec);
+        throw_if (ec);
    }

-    // ssl::stream::handshake (2 of 4)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/handshake/overload2.html
-    //
    virtual error_code handshake (handshake_type type, error_code& ec)
        BEAST_SOCKET_VIRTUAL;

-    // ssl::stream::async_handshake (1 of 2)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/async_handshake/overload1.html
-    //
-    template <typename HandshakeHandler>
-    void async_handshake (handshake_type type, BOOST_ASIO_MOVE_ARG(HandshakeHandler) handler)
-    {
-        return async_handshake (type,
-                newHandshakeHandler (BOOST_ASIO_MOVE_CAST(HandshakeHandler)(handler)));
-    }
-
-    virtual void async_handshake (handshake_type type, SharedHandlerPtr handler)
+    virtual void async_handshake (handshake_type type, error_handler handler)
        BEAST_SOCKET_VIRTUAL;

    //--------------------------------------------------------------------------

-#if BEAST_ASIO_HAS_BUFFEREDHANDSHAKE
-    // ssl::stream::handshake (3 of 4)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/handshake/overload3.html
-    //
-    template <typename ConstBufferSequence>
-    void handshake (handshake_type type, ConstBufferSequence const& buffers)
-    {
-        error_code ec;
-        throw_error (handshake (type, buffers, ec), __FILE__, __LINE__);
-    }
-
-    // ssl::stream::handshake (4 of 4)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/handshake/overload4.html
-    //
-    template <typename ConstBufferSequence>
-    error_code handshake (handshake_type type,
-        ConstBufferSequence const& buffers, error_code& ec)
-    {
-        return handshake (type, ConstBuffers (buffers), ec);
-    }
-
    virtual error_code handshake (handshake_type type,
-        ConstBuffers const& buffers, error_code& ec)
-            BEAST_SOCKET_VIRTUAL;
+        const_buffers buffers, error_code& ec)
+        BEAST_SOCKET_VIRTUAL;

-    // ssl::stream::async_handshake (2 of 2)
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/async_handshake/overload2.html
-    //
-    template <typename ConstBufferSequence, typename BufferedHandshakeHandler>
-    void async_handshake (handshake_type type, ConstBufferSequence const& buffers,
-        BOOST_ASIO_MOVE_ARG(BufferedHandshakeHandler) handler)
-    {
-        return async_handshake (type, ConstBuffers (buffers),
-            newBufferedHandshakeHandler (BOOST_ASIO_MOVE_CAST(BufferedHandshakeHandler)(handler)));
-    }
-
-    virtual void async_handshake (handshake_type type, ConstBuffers const& buffers,
-        SharedHandlerPtr handler)
-            BEAST_SOCKET_VIRTUAL;
-#endif
+    virtual void async_handshake (handshake_type type,
+        const_buffers buffers, transfer_handler handler)
+        BEAST_SOCKET_VIRTUAL;

    //--------------------------------------------------------------------------

-    // ssl::stream::shutdown
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/shutdown.html
-    //
    void shutdown ()
    {
        error_code ec;
-        throw_error (shutdown (ec), __FILE__, __LINE__);
+        shutdown (ec);
+        throw_if (ec);
    }

    virtual error_code shutdown (error_code& ec)
        BEAST_SOCKET_VIRTUAL;

-    // ssl::stream::async_shutdown
-    // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/async_shutdown.html
-    //
-    template <typename ShutdownHandler>
-    void async_shutdown (BOOST_ASIO_MOVE_ARG(ShutdownHandler) handler)
-    {
-        return async_shutdown (
-            newShutdownHandler (BOOST_ASIO_MOVE_CAST(ShutdownHandler)(handler)));
-    }
-
-    virtual void async_shutdown (SharedHandlerPtr handler)
+    virtual void async_shutdown (error_handler handler)
        BEAST_SOCKET_VIRTUAL;
 };

+}
+}
+
 #endif
--- a/src/beast/beast/asio/bind_handler.h
+++ b/src/beast/beast/asio/bind_handler.h
@@ -0,0 +1,163 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_BIND_HANDLER_H_INCLUDED
+#define BEAST_ASIO_BIND_HANDLER_H_INCLUDED
+
+#include <boost/asio/detail/handler_alloc_helpers.hpp>
+#include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/handler_invoke_helpers.hpp>
+
+#include <functional>
+#include "../cxx14/type_traits.h" // <type_traits>
+#include "../cxx14/utility.h" // <utility>
+
+namespace beast {
+namespace asio {
+
+namespace detail {
+
+/** Nullary handler that calls Handler with bound arguments.
+    The rebound handler provides the same io_service execution
+    guarantees as the original handler.
+*/
+template <class DeducedHandler, class... Args>
+class bound_handler
+{
+private:
+    typedef std::tuple <std::decay_t <Args>...> args_type;
+
+    std::decay_t <DeducedHandler> m_handler;
+    args_type m_args;
+
+    template <class Handler, class Tuple, std::size_t... S>
+    static void invoke (Handler& h, Tuple& args,
+        std::index_sequence <S...>)
+    {
+        h (std::get <S> (args)...);
+    }
+
+public:
+    typedef void result_type;
+
+    bound_handler (DeducedHandler&& handler, Args&&... args)
+        : m_handler (std::forward <DeducedHandler> (handler))
+        , m_args (std::forward <Args> (args)...)
+    {
+    }
+
+    void
+    operator() ()
+    {
+        invoke (m_handler, m_args,
+            std::index_sequence_for <Args...> ());
+    }
+
+    void
+    operator() () const
+    {
+        invoke (m_handler, m_args,
+            std::index_sequence_for <Args...> ());
+    }
+
+    template <class Function>
+    friend
+    void
+    asio_handler_invoke (Function& f, bound_handler* h)
+    {
+        boost_asio_handler_invoke_helpers::
+            invoke (f, h->m_handler);
+    }
+
+    template <class Function>
+    friend
+    void
+    asio_handler_invoke (Function const& f, bound_handler* h)
+    {
+        boost_asio_handler_invoke_helpers::
+            invoke (f, h->m_handler);
+    }
+
+    friend
+    void*
+    asio_handler_allocate (std::size_t size, bound_handler* h)
+    {
+        return boost_asio_handler_alloc_helpers::
+            allocate (size, h->m_handler);
+    }
+
+    friend
+    void
+    asio_handler_deallocate (void* p, std::size_t size, bound_handler* h)
+    {
+        boost_asio_handler_alloc_helpers::
+            deallocate (p, size, h->m_handler);
+    }
+
+    friend
+    bool
+    asio_handler_is_continuation (bound_handler* h)
+    {
+        return boost_asio_handler_cont_helpers::
+            is_continuation (h->m_handler);
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Binds parameters to a handler to produce a nullary functor.
+    The returned handler provides the same io_service execution guarantees
+    as the original handler. This is designed to use as a replacement for
+    io_service::wrap, to ensure that the handler will not be invoked
+    immediately by the calling function.
+*/
+template <class DeducedHandler, class... Args>
+detail::bound_handler <DeducedHandler, Args...>
+bind_handler (DeducedHandler&& handler, Args&&... args)
+{
+    return detail::bound_handler <DeducedHandler, Args...> (
+        std::forward <DeducedHandler> (handler),
+            std::forward <Args> (args)...);
+}
+
+}
+}
+
+//------------------------------------------------------------------------------
+
+namespace std {
+
+template <class Handler, class... Args>
+void bind (beast::asio::detail::bound_handler <
+    Handler, Args...>, ...)  = delete;
+
+#if 0
+template <class Handler, class... Args>
+struct is_bind_expression <
+    beast::asio::detail::bound_handler <Handler, Args...>
+> : std::true_type
+{
+};
+#endif
+
+}
+
+#endif
--- a/src/beast/beast/asio/buffer_sequence.h
+++ b/src/beast/beast/asio/buffer_sequence.h
@@ -0,0 +1,110 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_BUFFER_SEQUENCE_H_INCLUDED
+#define BEAST_ASIO_BUFFER_SEQUENCE_H_INCLUDED
+
+#include <boost/asio/buffer.hpp>
+
+#include <algorithm>
+#include <iterator>
+#include "../cxx14/type_traits.h" // <type_traits>
+#include <vector>
+
+namespace beast {
+namespace asio {
+
+template <class Buffer>
+class buffer_sequence
+{
+private:
+    typedef std::vector <Buffer> sequence_type;
+
+public:
+    typedef Buffer value_type;
+    typedef typename sequence_type::const_iterator const_iterator;
+
+private:
+    sequence_type m_buffers;
+
+    template <class FwdIter>
+    void assign (FwdIter first, FwdIter last)
+    {
+        m_buffers.clear();
+        m_buffers.reserve (std::distance (first, last));
+        for (;first != last; ++first)
+            m_buffers.push_back (*first);
+    }
+
+public:
+    buffer_sequence ()
+    {
+    }
+
+    template <
+        class BufferSequence,
+        class = std::enable_if_t <std::is_constructible <
+            Buffer, typename BufferSequence::value_type>::value>
+    >
+    buffer_sequence (BufferSequence const& s)
+    {
+        assign (std::begin (s), std::end (s));
+    }
+
+    template <
+        class FwdIter,
+        class = std::enable_if_t <std::is_constructible <
+            Buffer, typename std::iterator_traits <
+            FwdIter>::value_type>::value>
+    >
+    buffer_sequence (FwdIter first, FwdIter last)
+    {
+        assign (first, last);
+    }
+
+    template <class BufferSequence>
+    std::enable_if_t <std::is_constructible <
+        Buffer, typename BufferSequence::value_type>::value,
+        buffer_sequence&
+    >
+    operator= (BufferSequence const& s)
+    {
+        return assign (s);
+    }
+
+    const_iterator
+    begin () const noexcept
+    {
+        return m_buffers.begin ();
+    }
+
+    const_iterator
+    end () const noexcept
+    {
+        return m_buffers.end ();
+    }
+};
+
+typedef buffer_sequence <boost::asio::const_buffer> const_buffers;
+typedef buffer_sequence <boost::asio::mutable_buffer> mutable_buffers;
+
+}
+}
+
+#endif
--- a/src/beast/beast/asio/impl/IPAddressConversion.cpp
+++ b/src/beast/beast/asio/impl/IPAddressConversion.cpp
@@ -20,34 +20,35 @@
 #include "../IPAddressConversion.h"

 namespace beast {
+namespace IP {

-IPAddress IPAddressConversion::from_asio (boost::asio::ip::address const& address)
+Endpoint from_asio (boost::asio::ip::address const& address)
 {
    if (address.is_v4 ())
    {
        boost::asio::ip::address_v4::bytes_type const bytes (
            address.to_v4().to_bytes());
-        return IPAddress (IPAddress::V4 (
+        return Endpoint (AddressV4 (
            bytes [0], bytes [1], bytes [2], bytes [3]));
    }

    // VFALCO TODO IPv6 support
    bassertfalse;
-    return IPAddress();
+    return Endpoint();
 }

-IPAddress IPAddressConversion::from_asio (boost::asio::ip::tcp::endpoint const& endpoint)
+Endpoint from_asio (boost::asio::ip::tcp::endpoint const& endpoint)
 {
-    return from_asio (endpoint.address()).withPort (endpoint.port());
+    return from_asio (endpoint.address()).at_port (endpoint.port());
 }

-boost::asio::ip::address IPAddressConversion::to_asio_address (IPAddress const& address)
+boost::asio::ip::address to_asio_address (Endpoint const& endpoint)
 {
-    if (address.isV4 ())
+    if (endpoint.address().is_v4())
    {
        return boost::asio::ip::address (
            boost::asio::ip::address_v4 (
-                address.v4().value));
+                endpoint.address().to_v4().value));
    }

    // VFALCO TODO IPv6 support
@@ -56,10 +57,11 @@ boost::asio::ip::address IPAddressConversion::to_asio_address (IPAddress const&
        boost::asio::ip::address_v6 ());
 }

-boost::asio::ip::tcp::endpoint IPAddressConversion::to_asio_endpoint (IPAddress const& address)
+boost::asio::ip::tcp::endpoint to_asio_endpoint (Endpoint const& endpoint)
 {
    return boost::asio::ip::tcp::endpoint (
-        to_asio_address (address), address.port());
+        to_asio_address (endpoint), endpoint.port());
 }

 }
+}
--- a/src/beast/beast/asio/io_latency_probe.h
+++ b/src/beast/beast/asio/io_latency_probe.h
@@ -0,0 +1,245 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_IO_LATENCY_PROBE_H_INCLUDED
+#define BEAST_ASIO_IO_LATENCY_PROBE_H_INCLUDED
+
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+#include <stdexcept>
+
+#include <boost/asio/deadline_timer.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/config.hpp>
+
+namespace beast {
+
+/** Measures handler latency on an io_service queue. */
+template <class Clock>
+class io_latency_probe
+{
+private:
+    typedef typename Clock::duration duration;
+    typedef typename Clock::time_point time_point;
+
+    std::recursive_mutex m_mutex;
+    std::condition_variable_any m_cond;
+    std::size_t m_count;
+    duration const m_period;
+    boost::asio::io_service& m_ios;
+    boost::asio::deadline_timer m_timer;
+    bool m_cancel;
+
+public:
+    io_latency_probe (duration const& period,
+        boost::asio::io_service& ios)
+        : m_count (1)
+        , m_period (period)
+        , m_ios (ios)
+        , m_timer (m_ios)
+        , m_cancel (false)
+    {
+    }
+
+    ~io_latency_probe ()
+    {
+        std::unique_lock <decltype (m_mutex)> lock (m_mutex);
+        cancel (lock, true);
+    }
+
+    /** Return the io_service associated with the latency probe. */
+    /** @{ */
+    boost::asio::io_service& get_io_service ()
+    {
+        return m_ios;
+    }
+
+    boost::asio::io_service const& get_io_service () const
+    {
+        return m_ios;
+    }
+    /** @} */
+
+    /** Cancel all pending i/o.
+        Any handlers which have already been queued will still be called.
+    */
+    /** @{ */
+    void cancel ()
+    {
+        std::unique_lock <decltype(m_mutex)> lock (m_mutex);
+        cancel (lock, true);
+    }
+
+    void cancel_async ()
+    {
+        std::unique_lock <decltype(m_mutex)> lock (m_mutex);
+        cancel (lock, false);
+    }
+    /** @} */
+
+    /** Measure one sample of i/o latency.
+        Handler will be called with this signature:
+            void Handler (Duration d);
+    */
+    template <class Handler>
+    void sample_one (Handler&& handler)
+    {
+        std::lock_guard <decltype(m_mutex)> lock (m_mutex);
+        if (m_cancel)
+            throw std::logic_error ("io_latency_probe is canceled");
+        m_ios.post (sample_op <Handler> (
+            std::forward <Handler> (handler),
+                Clock::now(), false, this));
+    }
+
+    /** Initiate continuous i/o latency sampling.
+        Handler will be called with this signature:
+            void Handler (std::chrono::milliseconds);
+    */
+    template <class Handler>
+    void sample (Handler&& handler)
+    {
+        std::lock_guard <decltype(m_mutex)> lock (m_mutex);
+        if (m_cancel)
+            throw std::logic_error ("io_latency_probe is canceled");
+        m_ios.post (sample_op <Handler> (
+            std::forward <Handler> (handler),
+                Clock::now(), true, this));
+    }
+
+private:
+    void cancel (std::unique_lock <decltype (m_mutex)>& lock,
+        bool wait)
+    {
+        if (! m_cancel)
+        {
+            --m_count;
+            m_cancel = true;
+        }
+
+        if (wait)
+#ifdef BOOST_NO_CXX11_LAMBDAS
+            while (m_count != 0)
+                m_cond.wait (lock);
+#else
+            m_cond.wait (lock, [this] {
+                return this->m_count == 0; });
+#endif
+    }
+
+    void addref ()
+    {
+        std::lock_guard <decltype(m_mutex)> lock (m_mutex);
+        ++m_count;
+    }
+
+    void release ()
+    {
+        std::lock_guard <decltype(m_mutex)> lock (m_mutex);
+        if (--m_count == 0)
+            m_cond.notify_all ();
+    }
+
+    template <class Handler>
+    struct sample_op
+    {
+        Handler m_handler;
+        time_point m_start;
+        bool m_repeat;
+        io_latency_probe* m_probe;
+
+        sample_op (Handler const& handler, time_point const& start,
+            bool repeat, io_latency_probe* probe)
+            : m_handler (handler)
+            , m_start (start)
+            , m_repeat (repeat)
+            , m_probe (probe)
+        {
+            m_probe->addref();
+        }
+
+        sample_op (sample_op const& other)
+            : m_handler (other.m_handler)
+            , m_start (other.m_start)
+            , m_probe (other.m_probe)
+        {
+            m_probe->addref();
+        }
+
+        ~sample_op ()
+        {
+            m_probe->release();
+        }
+
+        void operator() () const
+        {
+            typename Clock::time_point const now (Clock::now());
+            typename Clock::duration const elapsed (now - m_start);
+
+            m_handler (elapsed);
+
+            {
+                std::lock_guard <decltype (m_probe->m_mutex)
+                    > lock (m_probe->m_mutex);
+                if (m_probe->m_cancel)
+                    return;
+            }
+
+            if (m_repeat)
+            {
+                // Calculate when we want to sample again, and
+                // adjust for the expected latency.
+                //
+                typename Clock::time_point const when (
+                    now + m_probe->m_period - 2 * elapsed);
+
+                if (when <= now)
+                {
+                    // The latency is too high to maintain the desired
+                    // period so don't bother with a timer.
+                    //
+                    m_probe->m_ios.post (sample_op <Handler> (
+                        m_handler, now, m_repeat, m_probe));
+                }
+                else
+                {
+                    boost::posix_time::microseconds mms (
+                        std::chrono::duration_cast <
+                            std::chrono::microseconds> (
+                                when - now).count ());
+                    m_probe->m_timer.expires_from_now (mms);
+                    m_probe->m_timer.async_wait (sample_op <Handler> (
+                        m_handler, now, m_repeat, m_probe));
+                }
+            }
+        }
+
+        void operator () (boost::system::error_code const& ec)
+        {
+            typename Clock::time_point const now (Clock::now());
+            m_probe->m_ios.post (sample_op <Handler> (
+                m_handler, now, m_repeat, m_probe));
+        }
+    };
+};
+
+}
+
+#endif
--- a/src/beast/beast/asio/placeholders.h
+++ b/src/beast/beast/asio/placeholders.h
@@ -17,28 +17,23 @@
 */
 //==============================================================================

-#ifndef BEAST_MPL_COPYCONST_H_INCLUDED
-#define BEAST_MPL_COPYCONST_H_INCLUDED
+#ifndef BEAST_ASIO_PLACEHOLDERS_H_INCLUDED
+#define BEAST_ASIO_PLACEHOLDERS_H_INCLUDED

-#include "RemoveConst.h"
+#include <functional>

 namespace beast {
-namespace mpl {
+namespace asio {

-/** Copy `const` attribute from T to U if present. */
-/** @{ */
-template <typename T, typename U>
-struct CopyConst
-{
-    typedef typename RemoveConst<U>::type type;
-};
-
-template <typename T, typename U>
-struct CopyConst <T const, U>
-{
-    typedef typename RemoveConst<U>::type const type;
-};
-/** @} */
+namespace placeholders {
+// asio placeholders that work with std::bind
+namespace {
+static auto const error (std::placeholders::_1);
+static auto const bytes_transferred (std::placeholders::_2);
+static auto const iterator (std::placeholders::_2);
+static auto const signal_number (std::placeholders::_2);
+}
+}

 }
 }
--- a/src/beast/beast/asio/shared_handler.h
+++ b/src/beast/beast/asio/shared_handler.h
@@ -0,0 +1,472 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
+#define BEAST_ASIO_SHARED_HANDLER_H_INCLUDED
+
+#include "../mpl/IsCallPossible.h"
+
+#include <functional>
+#include <memory>
+#include "../cxx14/type_traits.h" // <type_traits>
+
+#include <boost/utility/base_from_member.hpp>
+
+#include <boost/asio/detail/handler_alloc_helpers.hpp>
+#include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/handler_invoke_helpers.hpp>
+
+#ifndef BEAST_ASIO_NO_ALLOCATE_SHARED
+#define BEAST_ASIO_NO_ALLOCATE_SHARED 0
+#endif
+
+#ifndef BEAST_ASIO_NO_HANDLER_RESULT_OF
+#define BEAST_ASIO_NO_HANDLER_RESULT_OF 1
+#endif
+
+namespace beast {
+namespace asio {
+
+class shared_handler_wrapper_base
+{
+public:
+    virtual ~shared_handler_wrapper_base()
+    {
+    }
+
+    virtual void invoke (std::function <void (void)> f) = 0;
+    virtual void* allocate (std::size_t size) = 0;
+    virtual void deallocate (void* p, std::size_t size) = 0;
+    virtual bool is_continuation () = 0;
+};
+
+//------------------------------------------------------------------------------
+
+template <class Signature>
+class shared_handler_wrapper_func
+    : public shared_handler_wrapper_base
+{
+private:
+    std::function <Signature> m_func;
+
+public:
+    template <class Handler>
+    explicit shared_handler_wrapper_func (Handler&& handler)
+        : m_func (std::ref (std::forward <Handler> (handler)))
+    {
+    }
+
+    template <class... Args>
+#if BEAST_ASIO_NO_HANDLER_RESULT_OF
+    void
+#else
+    std::result_of_t <std::function <Signature> (Args...)>
+#endif
+    operator() (Args&&... args) const
+    {
+        return m_func (std::forward <Args> (args)...);
+    }
+};
+
+//------------------------------------------------------------------------------
+
+namespace detail {
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable: 4512) // assignment operator could not be generated
+#endif
+
+template <class Signature, class Handler>
+class shared_handler_wrapper
+    : private boost::base_from_member <Handler>
+    , public shared_handler_wrapper_func <Signature>
+{
+private:
+    typedef boost::base_from_member <Handler> Base;
+
+    BEAST_DEFINE_IS_CALL_POSSIBLE(has_is_continuation, is_continuation);
+
+public:
+    shared_handler_wrapper (Handler&& handler)
+        : boost::base_from_member <Handler> (std::move (handler))
+        , shared_handler_wrapper_func <Signature> (Base::member)
+    {
+    }
+
+    shared_handler_wrapper (Handler const& handler)
+        : boost::base_from_member <Handler> (handler)
+        , shared_handler_wrapper_func <Signature> (Base::member)
+    {
+    }
+
+private:
+    void
+    invoke (std::function <void (void)> f) override
+    {
+        return boost_asio_handler_invoke_helpers::
+            invoke (f, Base::member);
+    }
+
+    void*
+    allocate (std::size_t size) override
+    {
+        return boost_asio_handler_alloc_helpers::
+            allocate (size, Base::member);
+    }
+
+    void
+    deallocate (void* p, std::size_t size) override
+    {
+        boost_asio_handler_alloc_helpers::
+            deallocate (p, size, Base::member);
+    }
+
+    bool
+    is_continuation () override
+    {
+        return is_continuation (std::integral_constant <bool,
+            has_is_continuation <Handler, bool(void)>::value>());
+    }
+
+    bool
+    is_continuation (std::true_type)
+    {
+        return Base::member.is_continuation();
+    }
+
+    bool
+    is_continuation (std::false_type)
+    {
+        return boost_asio_handler_cont_helpers::
+            is_continuation (Base::member);
+    }
+};
+
+#ifdef _MSC_VER
+#pragma warning (pop)
+#endif
+
+template <class T>
+struct is_shared_handler : public std::false_type
+{
+};
+
+//------------------------------------------------------------------------------
+
+template <class T, class Handler>
+class handler_allocator
+{
+private:
+    // We want a partial template specialization as a friend
+    // but that isn't allowed so we friend all versions. This
+    // should produce a compile error if Handler is not constructible
+    // from H.
+    //
+    template <class U, class H>
+    friend class handler_allocator;
+
+    Handler m_handler;
+
+public:
+    typedef T value_type;
+    typedef T* pointer;
+
+    template <class U>
+    struct rebind
+    {
+    public:
+        typedef handler_allocator <U, Handler> other;
+    };
+
+    handler_allocator() = delete;
+
+    handler_allocator (Handler const& handler)
+        : m_handler (handler)
+    {
+    }
+
+    template <class U>
+    handler_allocator (
+        handler_allocator <U, Handler> const& other)
+        : m_handler (other.m_handler)
+    {
+    }
+
+    handler_allocator&
+    operator= (handler_allocator const&) = delete;
+
+    pointer
+    allocate (std::ptrdiff_t n)
+    {
+        auto const size (n * sizeof (T));
+        return static_cast <pointer> (
+            boost_asio_handler_alloc_helpers::allocate (
+                size, m_handler));
+    }
+
+    void
+    deallocate (pointer p, std::ptrdiff_t n)
+    {
+        auto const size (n * sizeof (T));
+        boost_asio_handler_alloc_helpers::deallocate (
+            p, size, m_handler);
+    }
+
+    // Work-around for MSVC not using allocator_traits
+    // in the implementation of shared_ptr
+    //
+#ifdef _MSC_VER
+    void
+    destroy (T* t)
+    {
+        t->~T();
+    }
+#endif
+
+    friend
+    bool
+    operator== (handler_allocator const& lhs, handler_allocator const& rhs)
+    {
+        return true;
+    }
+
+    friend
+    bool
+    operator!= (handler_allocator const& lhs, handler_allocator const& rhs)
+    {
+        return ! (lhs == rhs);
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Handler shared reference that provides io_service execution guarantees. */
+template <
+    class Signature
+>
+class shared_handler
+{
+private:
+    template <class T>
+    friend class shared_handler_allocator;
+
+    typedef shared_handler_wrapper_func <
+        Signature> wrapper_type;
+
+    typedef std::shared_ptr <wrapper_type> ptr_type;
+
+    ptr_type m_ptr;
+
+public:
+    shared_handler()
+    {
+    }
+
+    template <
+        class DeducedHandler,
+        class = std::enable_if_t <
+            ! detail::is_shared_handler <
+                std::decay_t <DeducedHandler>>::value &&
+            std::is_constructible <std::function <Signature>,
+                std::decay_t <DeducedHandler>>::value
+            >
+    >
+    shared_handler (DeducedHandler&& handler)
+    {
+        typedef std::remove_reference_t <DeducedHandler> Handler;
+
+    #if BEAST_ASIO_NO_ALLOCATE_SHARED
+        m_ptr = std::make_shared <detail::shared_handler_wrapper <
+            Signature, Handler>> (std::forward <DeducedHandler> (handler));
+    #else
+        m_ptr = std::allocate_shared <detail::shared_handler_wrapper <
+            Signature, Handler>> (detail::handler_allocator <char, Handler> (
+                handler), std::forward <DeducedHandler> (handler));
+    #endif
+    }
+
+    shared_handler (shared_handler&& other)
+        : m_ptr (std::move (other.m_ptr))
+    {
+    }
+
+    shared_handler (shared_handler const& other)
+        : m_ptr (other.m_ptr)
+    {
+    }
+
+    shared_handler&
+    operator= (std::nullptr_t)
+    {
+        m_ptr = nullptr;
+    }
+
+    shared_handler&
+    operator= (shared_handler const& rhs)
+    {
+        m_ptr = rhs.m_ptr;
+        return *this;
+    }
+
+    bool
+    empty() const
+    {
+        return ! m_ptr.operator bool();
+    }
+
+    operator bool() const
+    {
+        return !empty();
+    }
+
+    void
+    reset()
+    {
+        m_ptr.reset();
+    }
+
+    template <class... Args>
+#if BEAST_ASIO_NO_HANDLER_RESULT_OF
+    void
+#else
+    std::result_of_t <std::function <Signature> (Args...)>
+#endif
+    operator() (Args&&... args) const
+    {
+        return (*m_ptr)(std::forward <Args> (args)...);
+    }
+
+    template <class Function>
+    friend
+    void
+    asio_handler_invoke (Function&& f, shared_handler* h)
+    {
+        return h->m_ptr->invoke (f);
+    }
+
+    friend
+    void*
+    asio_handler_allocate (
+        std::size_t size, shared_handler* h)
+    {
+        return h->m_ptr->allocate (size);
+    }
+
+    friend
+    void
+    asio_handler_deallocate (
+        void* p, std::size_t size, shared_handler* h)
+    {
+        return h->m_ptr->deallocate (p, size);
+    }
+
+    friend
+    bool
+    asio_handler_is_continuation (
+        shared_handler* h)
+    {
+        return h->m_ptr->is_continuation ();
+    }
+};
+
+//------------------------------------------------------------------------------
+
+namespace detail {
+
+template <
+    class Signature
+>
+struct is_shared_handler <
+    shared_handler <Signature>
+> : public std::true_type
+{
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+template <class T>
+class shared_handler_allocator
+{
+private:
+    template <class U>
+    friend class shared_handler_allocator;
+
+    std::shared_ptr <shared_handler_wrapper_base> m_ptr;
+
+public:
+    typedef T value_type;
+    typedef T* pointer;
+
+    shared_handler_allocator() = delete;
+
+    template <class Signature>
+    shared_handler_allocator (
+        shared_handler <Signature> const& handler)
+        : m_ptr (handler.m_ptr)
+    {
+    }
+
+    template <class U>
+    shared_handler_allocator (
+        shared_handler_allocator <U> const& other)
+        : m_ptr (other.m_ptr)
+    {
+    }
+
+    pointer
+    allocate (std::ptrdiff_t n)
+    {
+        auto const size (n * sizeof (T));
+        return static_cast <pointer> (
+            m_ptr->allocate (size));
+    }
+
+    void
+    deallocate (pointer p, std::ptrdiff_t n)
+    {
+        auto const size (n * sizeof (T));
+        m_ptr->deallocate (p, size);
+    }
+
+    friend
+    bool
+    operator== (shared_handler_allocator const& lhs,
+        shared_handler_allocator const& rhs)
+    {
+        return lhs.m_ptr == rhs.m_ptr;
+    }
+
+    friend
+    bool
+    operator!= (shared_handler_allocator const& lhs,
+        shared_handler_allocator const& rhs)
+    {
+        return ! (lhs == rhs);
+    }
+};
+
+}
+}
+
+#endif
--- a/src/beast/modules/beast_asio/sockets/SocketWrapper.h
+++ b/src/beast/modules/beast_asio/sockets/SocketWrapper.h
--- a/src/beast/beast/asio/tests/bind_handler_tests.cpp
+++ b/src/beast/beast/asio/tests/bind_handler_tests.cpp
@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "../bind_handler.h"
+
+#include <functional>
+
+namespace beast {
+namespace asio {
+
+class bind_handler_Tests : public UnitTest
+{
+public:
+    static void foo (int)
+    {
+    }
+
+    void runTest()
+    {
+        beginTestCase ("call");
+
+        auto f (bind_handler (std::bind (&foo, std::placeholders::_1),
+            42));
+
+        f();
+
+        pass();
+    }
+
+    bind_handler_Tests() : UnitTest ("bind_handler", "beast", runManual)
+    {
+    }
+};
+
+static bind_handler_Tests bind_handler_tests;
+
+}
+}
--- a/src/beast/beast/asio/tests/shared_handler_tests.cpp
+++ b/src/beast/beast/asio/tests/shared_handler_tests.cpp
@@ -0,0 +1,239 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "../shared_handler.h"
+
+// Disables is_constructible tests for std::function
+// Visual Studio std::function fails the is_constructible tests
+#ifndef BEAST_NO_STD_FUNCTION_CONSTRUCTIBLE
+# ifdef _MSC_VER
+#  define BEAST_NO_STD_FUNCTION_CONSTRUCTIBLE 1
+# else
+#  define BEAST_NO_STD_FUNCTION_CONSTRUCTIBLE 0
+# endif
+#endif
+
+namespace beast {
+
+class shared_handler_Tests : public UnitTest
+{
+public:
+    struct test_results
+    {
+        bool call;
+        bool invoke;
+        bool alloc;
+        bool dealloc;
+        bool cont;
+
+        test_results ()
+            : call (false)
+            , invoke (false)
+            , alloc (false)
+            , dealloc (false)
+            , cont (false)
+        {
+        }
+    };
+
+    struct test_handler
+    {
+        std::reference_wrapper <test_results> results;
+
+        explicit test_handler (test_results& results_)
+            : results (results_)
+        {
+        }
+
+        void operator() ()
+        {
+            results.get().call = true;
+        }
+
+        template <class Function>
+        friend void asio_handler_invoke (
+            Function& f, test_handler* h)
+        {
+            h->results.get().invoke = true;
+            f();
+        }
+
+        template <class Function>
+        friend void asio_handler_invoke (
+            Function const& f, test_handler* h)
+        {
+            h->results.get().invoke = true;
+            f();
+        }
+
+        friend void* asio_handler_allocate (
+            std::size_t size, test_handler* h)
+        {
+            h->results.get().alloc = true;
+            return boost::asio::asio_handler_allocate (size);
+        }
+
+        friend void asio_handler_deallocate (
+            void* p, std::size_t size, test_handler* h)
+        {
+            h->results.get().dealloc = true;
+            boost::asio::asio_handler_deallocate (p, size);
+        }
+
+        friend bool asio_handler_is_continuation (
+            test_handler* h)
+        {
+            h->results.get().cont = true;
+            return true;
+        }
+    };
+
+    struct test_invokable
+    {
+        bool call;
+
+        test_invokable ()
+            : call (false)
+        {
+        }
+
+        void operator() ()
+        {
+            call = true;
+        }
+    };
+
+    template <class Handler>
+    bool async_op (Handler&& handler)
+    {
+        void* const p (boost_asio_handler_alloc_helpers::allocate (32, handler));
+        handler();
+        boost_asio_handler_alloc_helpers::deallocate (p, 32, handler);
+        return boost_asio_handler_cont_helpers::is_continuation (handler);
+    }
+
+    void virtual_async_op (asio::shared_handler <void(void)> handler)
+    {
+        async_op (handler);
+    }
+
+    void runTest()
+    {
+        beginTestCase ("hooks");
+
+    #if ! BEAST_NO_STD_FUNCTION_CONSTRUCTIBLE
+        static_assert (! std::is_constructible <
+            std::function <void(void)>, int&&>::value,
+                "Cannot construct std::function from int&&");
+
+        static_assert (! std::is_constructible <
+            std::function <void(void)>, int>::value,
+                "Cannot construct std::function from int");
+
+        static_assert (! std::is_constructible <
+            asio::shared_handler <void(void)>, int>::value,
+                "Cannot construct shared_handler from int");
+    #endif
+
+        static_assert (std::is_constructible <
+            asio::shared_handler <void(int)>,
+                asio::shared_handler <void(int)>>::value,
+                    "Should construct <void(int)> from <void(int)>");
+
+        static_assert (! std::is_constructible <
+            asio::shared_handler <void(int)>,
+                asio::shared_handler <void(void)>>::value,
+                    "Can't construct <void(int)> from <void(void)>");
+
+        // Hooks called when using the raw handler
+        {
+            test_results r;
+            test_handler h (r);
+
+            async_op (h);
+            expect (r.call);
+            expect (r.alloc);
+            expect (r.dealloc);
+            expect (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), h);
+            expect (r.invoke);
+            expect (f.call);
+        }
+
+        // Use of std::function shows the hooks not getting called
+        {
+            test_results r;
+            std::function <void(void)> fh ((test_handler) (r));
+
+            async_op (fh);
+            expect (r.call);
+            unexpected (r.alloc);
+            unexpected (r.dealloc);
+            unexpected (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), fh);
+            unexpected (r.invoke);
+            expect (f.call);
+        }
+
+        // Make sure shared_handler calls the hooks
+        {
+            test_results r;
+            asio::shared_handler <void(void)> sh ((test_handler)(r));
+
+            async_op (sh);
+            expect (r.call);
+            expect (r.alloc);
+            expect (r.dealloc);
+            expect (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), sh);
+            expect (r.invoke);
+            expect (f.call);
+        }
+
+        // Make sure shared_handler via implicit conversion calls hooks
+        {
+            test_results r;
+            test_handler h (r);
+
+            virtual_async_op ((test_handler) (r));
+            expect (r.call);
+            expect (r.alloc);
+            expect (r.dealloc);
+            expect (r.cont);
+        }
+    }
+
+    shared_handler_Tests() : UnitTest ("shared_handler", "beast")
+    {
+    }
+};
+
+static shared_handler_Tests shared_handler_tests;
+
+}
--- a/src/beast/beast/asio/tests/wrap_handler_tests.cpp
+++ b/src/beast/beast/asio/tests/wrap_handler_tests.cpp
@@ -0,0 +1,287 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "../wrap_handler.h"
+
+#include <boost/version.hpp>
+
+#include <boost/bind.hpp>
+#include <functional>
+#include <memory>
+
+namespace beast {
+namespace asio {
+
+//------------------------------------------------------------------------------
+
+// Displays the order of destruction of parameters in the bind wrapper
+//
+class boost_bind_Tests : public UnitTest
+{
+public:
+    struct Result
+    {
+        std::string text;
+
+        void push_back (std::string const& s)
+        {
+            if (! text.empty())
+                text += ", ";
+            text += s;
+        }
+    };
+
+    struct Payload
+    {
+        std::reference_wrapper <Result> m_result;
+        std::string m_name;
+
+        explicit Payload (Result& result, std::string const& name)
+            : m_result (result)
+            , m_name (name)
+        {
+        }
+
+        ~Payload ()
+        {
+            m_result.get().push_back (m_name);
+        }
+    };
+
+    struct Arg
+    {
+        std::shared_ptr <Payload> m_payload;
+
+        Arg (Result& result, std::string const& name)
+            : m_payload (std::make_shared <Payload> (result, name))
+        {
+        }
+    };
+
+    static void foo (Arg const&, Arg const&, Arg const&)
+    {
+    }
+
+    void runTest()
+    {
+        beginTestCase ("order");
+        
+        {
+            Result r;
+            {
+                boost::bind (&foo,
+                    Arg (r, "one"),
+                    Arg (r, "two"),
+                    Arg (r, "three"));
+            }
+            logMessage (std::string ("boost::bind (") + r.text + ")");
+        }
+
+        {
+            Result r;
+            {
+                std::bind (&foo,
+                    Arg (r, "one"),
+                    Arg (r, "two"),
+                    Arg (r, "three"));
+            }
+            logMessage (std::string ("std::bind (") + r.text + ")");
+        }
+
+        pass();
+    }
+
+    boost_bind_Tests() : UnitTest ("bind", "beast", runManual)
+    {
+    }
+};
+
+static boost_bind_Tests boost_bind_tests;
+
+//------------------------------------------------------------------------------
+
+class wrap_handler_handler_Tests : public UnitTest
+{
+public:
+    struct test_results
+    {
+        bool call;
+        bool invoke;
+        bool alloc;
+        bool dealloc;
+        bool cont;
+
+        test_results ()
+            : call (false)
+            , invoke (false)
+            , alloc (false)
+            , dealloc (false)
+            , cont (false)
+        {
+        }
+    };
+
+    struct test_handler
+    {
+        std::reference_wrapper <test_results> results;
+
+        explicit test_handler (test_results& results_)
+            : results (results_)
+        {
+        }
+
+        void operator() ()
+        {
+            results.get().call = true;
+        }
+
+        template <class Function>
+        friend void asio_handler_invoke (
+            Function& f, test_handler* h)
+        {
+            h->results.get().invoke = true;
+            f();
+        }
+
+        template <class Function>
+        friend void asio_handler_invoke (
+            Function const& f, test_handler* h)
+        {
+            h->results.get().invoke = true;
+            f();
+        }
+
+        friend void* asio_handler_allocate (
+            std::size_t, test_handler* h)
+        {
+            h->results.get().alloc = true;
+            return nullptr;
+        }
+
+        friend void asio_handler_deallocate (
+            void*, std::size_t, test_handler* h)
+        {
+            h->results.get().dealloc = true;
+        }
+
+        friend bool asio_handler_is_continuation (
+            test_handler* h)
+        {
+            h->results.get().cont = true;
+            return true;
+        }
+    };
+
+    struct test_invokable
+    {
+        bool call;
+
+        test_invokable ()
+            : call (false)
+        {
+        }
+
+        void operator() ()
+        {
+            call = true;
+        }
+    };
+
+    template <class Handler>
+    bool async_op (Handler&& handler)
+    {
+        void* const p (boost_asio_handler_alloc_helpers::allocate (32, handler));
+        (handler)();
+        boost_asio_handler_alloc_helpers::deallocate (p, 32, handler);
+        return boost_asio_handler_cont_helpers::is_continuation (handler);
+    }
+
+    void runTest()
+    {
+        beginTestCase ("hooks");
+
+        // Hooks called when using the raw handler
+        {
+            test_results r;
+            test_handler h (r);
+
+            async_op (h);
+            expect (r.call);
+            expect (r.alloc);
+            expect (r.dealloc);
+            expect (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), h);
+            expect (r.invoke);
+            expect (f.call);
+        }
+
+        // Use of boost::bind shows the hooks not getting called
+        {
+            test_results r;
+            test_handler h (r);
+            auto b (std::bind (&test_handler::operator(), &h));
+
+            async_op (b);
+            expect (r.call);
+            unexpected (r.alloc);
+            unexpected (r.dealloc);
+            unexpected (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), b);
+            unexpected (r.invoke);
+            expect (f.call);
+        }
+
+        // Make sure the wrapped handler calls the hooks
+        {
+            test_results r;
+            test_handler h (r);
+            auto w (wrap_handler (
+                std::bind (&test_handler::operator(), test_handler(r)), h));
+
+            async_op (w);
+            expect (r.call);
+            expect (r.alloc);
+            expect (r.dealloc);
+            expect (r.cont);
+
+            test_invokable f;
+            boost_asio_handler_invoke_helpers::invoke (std::ref (f), w);
+            expect (r.invoke);
+            expect (f.call);
+        }
+    }
+
+    wrap_handler_handler_Tests() : UnitTest ("wrap_handler", "beast")
+    {
+    }
+};
+
+static wrap_handler_handler_Tests wrap_handler_handler_tests;
+
+}
+}
+
--- a/src/beast/beast/asio/wrap_handler.h
+++ b/src/beast/beast/asio/wrap_handler.h
@@ -0,0 +1,176 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_WRAP_HANDLER_H_INCLUDED
+#define BEAST_ASIO_WRAP_HANDLER_H_INCLUDED
+
+#include <boost/asio/detail/handler_alloc_helpers.hpp>
+#include <boost/asio/detail/handler_cont_helpers.hpp>
+#include <boost/asio/detail/handler_invoke_helpers.hpp>
+
+#include <type_traits>
+#include <utility>
+
+namespace beast {
+namespace asio {
+
+#ifdef _MSC_VER
+#pragma warning (push)
+#pragma warning (disable: 4512) // assignment operator could not be generated
+#endif
+
+namespace detail {
+
+/** A handler which wraps another handler using a specfic context.
+    The handler is invoked with the same io_service execution guarantees
+    as the provided context.
+    @note A copy of Context is made.
+*/
+template <class Handler, class Context>
+class wrapped_handler
+{
+private:
+    Handler m_handler;
+    Context m_context;
+    bool m_continuation;
+
+    // If this goes off, consider carefully what the intent is.
+    static_assert (! std::is_reference <Handler>::value,
+        "Handler should not be a reference type");
+
+public:
+    wrapped_handler (bool continuation, Handler&& handler, Context context)
+        : m_handler (std::move (handler))
+        , m_context (context)
+        , m_continuation (continuation ? true :
+            boost_asio_handler_cont_helpers::is_continuation (context))
+    {
+    }
+
+    wrapped_handler (bool continuation, Handler const& handler, Context context)
+        : m_handler (handler)
+        , m_context (context)
+        , m_continuation (continuation ? true :
+            boost_asio_handler_cont_helpers::is_continuation (context))
+    {
+    }
+
+    template <class... Args>
+    void
+    operator() (Args&&... args)
+    {
+        m_handler (std::forward <Args> (args)...);
+    }
+
+    template <class... Args>
+    void
+    operator() (Args&&... args) const
+    {
+        m_handler (std::forward <Args> (args)...);
+    }
+
+    template <class Function>
+    friend
+    void
+    asio_handler_invoke (Function& f, wrapped_handler* h)
+    {
+        boost_asio_handler_invoke_helpers::
+            invoke (f, h->m_context);
+    }
+
+    template <class Function>
+    friend
+    void
+    asio_handler_invoke (Function const& f, wrapped_handler* h)
+    {
+        boost_asio_handler_invoke_helpers::
+            invoke (f, h->m_context);
+    }
+
+    friend
+    void*
+    asio_handler_allocate (std::size_t size, wrapped_handler* h)
+    {
+        return boost_asio_handler_alloc_helpers::
+            allocate (size, h->m_context);
+    }
+
+    friend
+    void
+    asio_handler_deallocate (void* p, std::size_t size, wrapped_handler* h)
+    {
+        boost_asio_handler_alloc_helpers::
+            deallocate (p, size, h->m_context);
+    }
+
+    friend
+    bool
+    asio_handler_is_continuation (wrapped_handler* h)
+    {
+        return h->m_continuation;
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+// Tag for dispatching wrap_handler with is_continuation == true
+enum continuation_t
+{
+    continuation
+};
+
+/** Returns a wrapped handler so it executes within another context.
+    The handler is invoked with the same io_service execution guarantees
+    as the provided context. The handler will be copied if necessary.
+    @note A copy of Context is made.
+*/
+/** @{ */
+template <class DeducedHandler, class Context>
+detail::wrapped_handler <
+    std::remove_reference_t <DeducedHandler>,
+    Context
+>
+wrap_handler (DeducedHandler&& handler, Context const& context,
+    bool continuation = false)
+{
+    typedef std::remove_reference_t <DeducedHandler> Handler;
+    return detail::wrapped_handler <Handler, Context> (continuation,
+        std::forward <DeducedHandler> (handler), context);
+}
+
+template <class DeducedHandler, class Context>
+detail::wrapped_handler <
+    std::remove_reference_t <DeducedHandler>,
+    Context
+>
+wrap_handler (continuation_t, DeducedHandler&& handler,
+    Context const& context)
+{
+    typedef std::remove_reference_t <DeducedHandler> Handler;
+    return detail::wrapped_handler <Handler, Context> (true,
+        std::forward <DeducedHandler> (handler), context);
+}
+/** @} */
+
+}
+}
+
+#endif
--- a/src/beast/beast/boost/get_pointer.h
+++ b/src/beast/beast/boost/get_pointer.h
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BOOST_GET_POINTER_H_INCLUDED
+#define BEAST_BOOST_GET_POINTER_H_INCLUDED
+
+#include <boost/get_pointer.hpp>
+
+// Boost 1.55 incorrectly defines BOOST_NO_CXX11_SMART_PTR
+// when building with clang 3.4 and earlier. This workaround
+// gives beast its own overloads.
+
+#ifdef BOOST_NO_CXX11_SMART_PTR
+#include <memory>
+namespace beast {
+template <class T>
+T* get_pointer (std::unique_ptr<T> const& p)
+{
+    return p.get();
+}
+
+template <class T>
+T* get_pointer (std::shared_ptr<T> const& p)
+{
+    return p.get();
+}
+}
+#endif
+
+#endif
--- a/src/beast/beast/chrono/Chrono.cpp
+++ b/src/beast/beast/chrono/Chrono.cpp
@@ -19,5 +19,12 @@

 #include "BeastConfig.h"

+#include "../Config.h"
+#include "../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "impl/abstract_clock.cpp"
+#include "impl/chrono_io.cpp"
+#include "impl/basic_seconds_clock.cpp"
+
 #include "impl/CPUMeter.cpp"
 #include "impl/RelativeTime.cpp"
--- a/src/beast/beast/chrono/abstract_clock.h
+++ b/src/beast/beast/chrono/abstract_clock.h
@@ -0,0 +1,166 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_ABSTRACT_CLOCK_H_INCLUDED
+#define BEAST_CHRONO_ABSTRACT_CLOCK_H_INCLUDED
+
+#include <chrono>
+
+#include "chrono_io.h"
+
+namespace beast {
+
+/** Abstract interface to a clock.
+
+    The abstract clock interface allows a dependency injection to take
+    place so that the choice of implementation can be made at run-time
+    instead of compile time. The trade-off is that the Duration used to
+    represent the clock must be chosen at compile time and cannot be
+    changed. This includes both the choice of representation (integers
+    for example) and the period in ticks corresponding to one second.
+
+    Example:
+
+    @code
+
+    struct Implementation
+    {
+        abstract_clock <std::chrono::seconds>& m_clock;
+
+        // Dependency injection
+        //
+        explicit Implementation (
+            abstract_clock <std::chrono::seconds>& clock)
+            : m_clock (clock)
+        {
+        }
+    };
+
+    @endcode
+
+    @tparam The length of time, in seconds, corresponding to one tick.
+*/
+template <class Duration>
+class abstract_clock
+{
+public:
+    typedef typename Duration::rep rep;
+    typedef typename Duration::period period;
+    typedef Duration duration;
+    typedef std::chrono::time_point <
+        abstract_clock, duration> time_point;
+
+    virtual ~abstract_clock () { }
+
+    /** Returns `true` if this is a steady clock. */
+    virtual bool is_steady () const = 0;
+
+    /** Returns the current time. */
+    virtual time_point now () const = 0;
+
+    /** Convert the specified time point to a string. */
+    /** @{ */
+    virtual std::string to_string (time_point const& tp) const = 0;
+
+    template <class Duration2>
+    std::string to_string (
+        std::chrono::time_point <abstract_clock, Duration2> const& tp) const
+    {
+        return to_string (
+            std::chrono::time_point_cast <Duration> (tp));
+    }
+    /** @} */
+
+    /** Returning elapsed ticks since the epoch. */
+    rep elapsed () const
+    {
+        return now().time_since_epoch().count();
+    }
+};
+
+//------------------------------------------------------------------------------
+
+namespace detail {
+
+template <class TrivialClock, class Duration>
+struct basic_abstract_clock_wrapper : public abstract_clock <Duration>
+{
+    using typename abstract_clock <Duration>::duration;
+    using typename abstract_clock <Duration>::time_point;
+
+    bool is_steady () const
+    {
+        return TrivialClock::is_steady;
+    }
+
+    time_point now () const
+    {
+        return time_point (duration (
+            std::chrono::duration_cast <duration> (
+                TrivialClock::now().time_since_epoch ()).count ()));
+    }
+};
+
+template <class TrivialClock, class Duration>
+struct abstract_clock_wrapper
+    : public basic_abstract_clock_wrapper <TrivialClock, Duration>
+{
+    // generic conversion displays the duration
+    std::string to_string (typename basic_abstract_clock_wrapper <
+        TrivialClock, Duration>::time_point const& tp) const
+    {
+        std::stringstream ss;
+        ss << tp.time_since_epoch();
+        return ss.str ();
+    }
+};
+
+/*
+template <class Duration>
+struct abstract_clock_wrapper <std::chrono::system_clock, Duration>
+    : public basic_abstract_clock_wrapper <std::chrono::system_clock, Duration>
+{
+    typedef std::chrono::system_clock clock_type;
+    std::string to_string (time_point const& tp)
+    {
+        std::stringstream ss;
+        ss << clock_type::time_point (tp.time_since_epoch ());
+        return ss.str ();
+    }
+};
+*/
+
+}
+
+//------------------------------------------------------------------------------
+
+/** Retrieve a discrete clock for a type implementing the Clock concept.
+    The interface is created as an object with static storage duration.
+*/
+template <class TrivialClock, class Duration>
+abstract_clock <Duration>& get_abstract_clock ()
+{
+    static detail::abstract_clock_wrapper <
+        TrivialClock, Duration> clock;
+    return clock;
+}
+
+}
+
+#endif
--- a/src/beast/beast/chrono/basic_seconds_clock.h
+++ b/src/beast/beast/chrono/basic_seconds_clock.h
@@ -0,0 +1,237 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
+#define BEAST_CHRONO_BASIC_SECONDS_CLOCK_H_INCLUDED
+
+#include <algorithm>
+#include <chrono>
+
+#ifndef BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND
+# ifdef _MSC_VER
+// Visual Studio 2012, 2013 have a bug in std::thread that
+// causes a hang on exit, in the library function atexit()
+#  if BEAST_USE_BOOST_FEATURES
+#   define BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND 1
+#  else
+#   define BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND 0
+#  endif
+# else
+#  define BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND 0
+# endif
+#endif
+
+#if BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND
+# include <boost/version.hpp>
+# if BOOST_VERSION >= 105500
+#  include <boost/thread/thread.hpp>
+#  include <boost/thread/mutex.hpp>
+#  include <boost/thread/condition_variable.hpp>
+#  include <boost/chrono.hpp>
+# else
+#  error "Boost version 1.55.0 or later is required"
+# endif
+#else
+# include <condition_variable>
+# include <mutex>
+# include <thread>
+#endif
+
+#include "../chrono/chrono_util.h"
+
+namespace beast {
+
+namespace detail {
+
+class seconds_clock_worker
+{
+public:
+    virtual void sample () = 0;
+};
+
+//------------------------------------------------------------------------------
+
+// Updates the clocks
+class seconds_clock_thread
+{
+public:
+#if BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND
+    typedef boost::mutex mutex;
+    typedef boost::condition_variable cond_var;
+    typedef boost::lock_guard <mutex> lock_guard;
+    typedef boost::unique_lock <mutex> unique_lock;
+    typedef boost::chrono::steady_clock clock_type;
+    typedef boost::chrono::seconds seconds;
+    typedef boost::thread thread;
+#else
+    typedef std::mutex mutex;
+    typedef std::condition_variable cond_var;
+    typedef std::lock_guard <mutex> lock_guard;
+    typedef std::unique_lock <mutex> unique_lock;
+    typedef std::chrono::steady_clock clock_type;
+    typedef std::chrono::seconds seconds;
+    typedef std::thread thread;
+#endif
+    typedef std::vector <seconds_clock_worker*> workers;
+
+    bool m_stop;
+    mutex m_mutex;
+    cond_var m_cond;
+    workers m_workers;
+    thread m_thread;
+
+    seconds_clock_thread ()
+        : m_stop (false)
+    {
+        m_thread = thread (std::bind(
+            &seconds_clock_thread::run, this));
+    }
+
+    ~seconds_clock_thread ()
+    {
+        {
+            lock_guard lock (m_mutex);
+            m_stop = true;
+        }
+        m_cond.notify_all();
+        m_thread.join ();
+    }
+
+    void add (seconds_clock_worker& w)
+    {
+        lock_guard lock (m_mutex);
+        m_workers.push_back (&w);
+    }
+
+    void remove (seconds_clock_worker& w)
+    {
+        lock_guard lock (m_mutex);
+        m_workers.erase (std::find (
+            m_workers.begin (), m_workers.end(), &w));
+    }
+
+    void run ()
+    {
+        unique_lock lock (m_mutex);;
+
+        for (;;)
+        {
+            for (auto iter : m_workers)
+                iter->sample();
+
+            clock_type::time_point const when (
+                floor <seconds> (
+                    clock_type::now().time_since_epoch()) +
+                        seconds (1));
+
+            if (m_cond.wait_until (lock, when, [this]{ return m_stop; }))
+                return;
+        }
+    }
+
+    static seconds_clock_thread& instance ()
+    {
+        static seconds_clock_thread singleton;
+        return singleton;
+    }
+};
+
+}
+
+//------------------------------------------------------------------------------
+
+/** A clock whose minimum resolution is one second.
+    The purpose of this class is to optimize the performance of the now()
+    member function call. It uses a dedicated thread that wakes up at least
+    once per second to sample the requested trivial clock.
+    @tparam TrivialClock The clock to sample.
+*/
+template <class TrivialClock>
+class basic_seconds_clock
+{
+public:
+    typedef std::chrono::seconds resolution;
+    typedef typename resolution::rep rep;
+    typedef typename resolution::period period;
+    typedef std::chrono::duration <rep, period> duration;
+    typedef std::chrono::time_point <basic_seconds_clock> time_point;
+
+    static bool const is_steady = TrivialClock::is_steady;
+
+    static time_point now ()
+    {
+        // Make sure the thread is constructed before the
+        // worker otherwise we will crash during destruction
+        // of objects with static storage duration.
+        struct initializer
+        {
+            initializer ()
+            {
+                detail::seconds_clock_thread::instance();
+            }
+        };
+        static initializer init;
+
+        struct worker : detail::seconds_clock_worker
+        {
+            typedef std::mutex mutex;
+            typedef std::lock_guard <mutex> lock_guard;
+
+            time_point m_now;
+            mutex m_mutex;
+
+            static time_point get_now ()
+            {
+                return time_point (floor <resolution> (
+                    TrivialClock::now().time_since_epoch()));
+            }
+
+            worker ()
+                : m_now (get_now ())
+            {
+                detail::seconds_clock_thread::instance().add (*this);
+            }
+
+            ~worker ()
+            {
+                detail::seconds_clock_thread::instance().remove (*this);
+            }
+
+            time_point now()
+            {
+                lock_guard lock (m_mutex);
+                return m_now;
+            }
+
+            void sample ()
+            {
+                lock_guard lock (m_mutex);
+                m_now = get_now ();
+            }
+        };
+
+        static worker w;
+
+        return w.now ();
+    }
+};
+
+}
+
+#endif
--- a/src/beast/beast/chrono/chrono_io.h
+++ b/src/beast/beast/chrono/chrono_io.h
--- a/src/beast/beast/chrono/chrono_util.h
+++ b/src/beast/beast/chrono/chrono_util.h
@@ -0,0 +1,66 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_UTIL_H_INCLUDED
+#define BEAST_CHRONO_UTIL_H_INCLUDED
+
+// From Howard Hinnant
+// http://home.roadrunner.com/~hinnant/duration_io/chrono_util.html
+
+// round down
+template <class To, class Rep, class Period>
+To floor(std::chrono::duration <Rep, Period> const& d)
+{
+    To t = std::chrono::duration_cast<To>(d);
+    if (t > d)
+        --t;
+    return t;
+}
+
+// round to nearest, to even on tie
+template <class To, class Rep, class Period>
+To round (std::chrono::duration <Rep, Period> const& d)
+{
+    To t0 = std::chrono::duration_cast<To>(d);
+    To t1 = t0;
+    ++t1;
+    auto diff0 = d - t0;
+    auto diff1 = t1 - d;
+    if (diff0 == diff1)
+    {
+        if (t0.count() & 1)
+            return t1;
+        return t0;
+    }
+    else if (diff0 < diff1)
+        return t0;
+    return t1;
+}
+
+// round up
+template <class To, class Rep, class Period>
+To ceil (std::chrono::duration <Rep, Period> const& d)
+{
+    To t = std::chrono::duration_cast<To>(d);
+    if (t < d)
+        ++t;
+    return t;
+}
+
+#endif
--- a/src/beast/beast/chrono/impl/RelativeTime.cpp
+++ b/src/beast/beast/chrono/impl/RelativeTime.cpp
@@ -256,23 +256,29 @@ std::string RelativeTime::to_string () const
 }

 }
-
-namespace beast {
-	
-namespace detail {
 	
 #if BEAST_WINDOWS

 #include <windows.h>

+namespace beast {
+namespace detail {
+
 static double monotonicCurrentTimeInSeconds()
 {
 	return GetTickCount64() / 1000.0;
 }
+ 
+}
+}
 	
 #elif BEAST_MAC || BEAST_IOS

-#include <time.h>
+#include <mach/mach_time.h>
+#include <mach/mach.h>
+
+namespace beast {
+namespace detail {
 	
 static double monotonicCurrentTimeInSeconds()
 {
@@ -309,20 +315,31 @@ static double monotonicCurrentTimeInSeconds()

    return mach_absolute_time() * data.ratio;
 }
+}
+}

 #else
 	
 #include <time.h>

+namespace beast {
+namespace detail {
+
 static double monotonicCurrentTimeInSeconds()
 {
 	timespec t;
 	clock_gettime (CLOCK_MONOTONIC, &t);
 	return t.tv_sec + t.tv_nsec / 1000000000.0;
 }
+
+}
+}
 	
 #endif

+namespace beast {
+namespace detail {
+
 // Records and returns the time from process startup
 static double getStartupTime()
 {
--- a/src/beast/beast/chrono/impl/abstract_clock.cpp
+++ b/src/beast/beast/chrono/impl/abstract_clock.cpp
@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../abstract_clock.h"
+#include "../manual_clock.h"
+
+#include <thread>
+
+#include <string>
+#include <sstream>
+
+namespace beast {
+
+class abstract_clock_tests : public UnitTest
+{
+public:
+    void test (abstract_clock <std::chrono::seconds>& c)
+    {
+        {
+            auto const t1 (c.now ());
+            std::this_thread::sleep_for (
+                std::chrono::milliseconds (1500));
+            auto const t2 (c.now ());
+
+            std::stringstream ss;
+            ss <<
+                "t1= " << c.to_string (t1) <<
+                ", t2= " << c.to_string (t2) <<
+                ", elapsed= " << (t2 - t1);
+            logMessage (ss.str());
+        }
+    }
+
+    void test_manual ()
+    {
+        typedef manual_clock <std::chrono::seconds> clock_type;
+        clock_type c;
+
+        std::stringstream ss;
+
+        ss << "now() = " << c.to_string (c.now ()) << std::endl;
+
+        c.set (clock_type::time_point (std::chrono::seconds (1)));
+        ss << "now() = " << c.to_string (c.now ()) << std::endl;
+
+        c.set (clock_type::time_point (std::chrono::seconds (2)));
+        ss << "now() = " << c.to_string (c.now ()) << std::endl;
+
+        logMessage (ss.str());
+    }
+
+    void runTest ()
+    {
+        beginTestCase ("Syntax");
+
+        logMessage ("steady_clock");
+        test (get_abstract_clock <std::chrono::steady_clock,
+            std::chrono::seconds> ());
+
+        logMessage ("system_clock");
+        test (get_abstract_clock <std::chrono::system_clock,
+            std::chrono::seconds> ());
+
+        logMessage ("high_resolution_clock");
+        test (get_abstract_clock <std::chrono::high_resolution_clock,
+            std::chrono::seconds> ());
+
+        logMessage ("manual_clock");
+        test_manual ();
+
+        pass ();
+    }
+
+    abstract_clock_tests ()
+        : UnitTest ("abstract_clock", "beast", runManual)
+    {
+    }
+};
+
+static abstract_clock_tests abstract_clock_tests_;
+
+}
--- a/src/beast/beast/chrono/impl/basic_seconds_clock.cpp
+++ b/src/beast/beast/chrono/impl/basic_seconds_clock.cpp
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../basic_seconds_clock.h"
+
+#include "../../Config.h"
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+
+namespace beast {
+
+class basic_seconds_clock_Tests : public UnitTest
+{
+public:
+    void runTest ()
+    {
+        beginTestCase ("now");
+
+        basic_seconds_clock <std::chrono::steady_clock>::now ();
+
+        pass ();
+    }
+
+    basic_seconds_clock_Tests() : UnitTest("basic_seconds_clock", "beast")
+    {
+    }
+};
+
+static basic_seconds_clock_Tests basic_seconds_clock_tests;
+
+}
--- a/src/beast/beast/chrono/impl/chrono_io.cpp
+++ b/src/beast/beast/chrono/impl/chrono_io.cpp
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+//  chrono_io
+//
+//  (C) Copyright Howard Hinnant
+//  Use, modification and distribution are subject to the Boost Software License,
+//  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt).
+
+#include "../chrono_io.h"
+
+//_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std {
+
+namespace chrono
+{
+
+locale::id
+durationpunct::id;
+
+}  // chrono
+
+//_LIBCPP_END_NAMESPACE_STD
+}
--- a/src/beast/beast/chrono/manual_clock.h
+++ b/src/beast/beast/chrono/manual_clock.h
@@ -0,0 +1,92 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
+#define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED
+
+#include "abstract_clock.h"
+
+namespace beast {
+
+/** Manual clock implementation.
+    This concrete class implements the @ref abstract_clock interface and
+    allows the time to be advanced manually, mainly for the purpose of
+    providing a clock in unit tests.
+    @tparam The length of time, in seconds, corresponding to one tick.
+*/
+template <class Duration, bool IsSteady = true>
+class manual_clock : public abstract_clock <Duration>
+{
+public:
+    using typename abstract_clock <Duration>::rep;
+    using typename abstract_clock <Duration>::duration;
+    using typename abstract_clock <Duration>::time_point;
+
+    explicit manual_clock (time_point const& t = time_point (Duration (0)))
+        : m_now (t)
+    {
+    }
+
+    bool is_steady () const
+    {
+        return IsSteady;
+    }
+
+    time_point now () const
+    {
+        return m_now;
+    }
+
+    std::string to_string (time_point const& tp) const
+    {
+        std::stringstream ss;
+        ss << tp.time_since_epoch() << " from start";
+        return ss.str ();
+    }
+
+    /** Set the current time of the manual clock.
+        Precondition:
+            ! IsSteady || t > now()
+    */
+    void set (time_point const& t)
+    {
+        //if (IsSteady)
+        m_now = t;
+    }
+
+    /** Convenience for setting the time using a duration in @ref rep units. */
+    void set (rep v)
+    {
+        set (time_point (duration (v)));
+    }
+
+    /** Convenience for advancing the clock by one. */
+    manual_clock& operator++ ()
+    {
+        m_now += duration (1);
+        return *this;
+    }
+
+private:
+    time_point m_now;
+};
+
+}
+
+#endif
--- a/src/beast/beast/chrono/ratio_io.h
+++ b/src/beast/beast/chrono/ratio_io.h
@@ -0,0 +1,622 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+//  ratio_io
+//
+//  (C) Copyright Howard Hinnant
+//  Use, modification and distribution are subject to the Boost Software License,
+//  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt).
+
+#ifndef BEAST_CHRONO_RATIO_IO_H_INCLUDED
+#define BEAST_CHRONO_RATIO_IO_H_INCLUDED
+
+/*
+
+    ratio_io synopsis
+
+#include <ratio>
+#include <string>
+
+namespace std
+{
+
+template <class Ratio, class charT>
+struct ratio_string
+{
+    static basic_string<charT> symbol();
+    static basic_string<charT> prefix();
+};
+
+}  // std
+
+*/
+
+#include <ratio>
+#include <string>
+#include <sstream>
+
+//_LIBCPP_BEGIN_NAMESPACE_STD
+namespace std {
+
+template <class _Ratio, class _CharT>
+struct ratio_string
+{
+    static basic_string<_CharT> symbol() {return prefix();}
+    static basic_string<_CharT> prefix();
+};
+
+template <class _Ratio, class _CharT>
+basic_string<_CharT>
+ratio_string<_Ratio, _CharT>::prefix()
+{
+    basic_ostringstream<_CharT> __os;
+    __os << _CharT('[') << _Ratio::num << _CharT('/')
+                        << _Ratio::den << _CharT(']');
+    return __os.str();
+}
+
+// atto
+
+template <>
+struct ratio_string<atto, char>
+{
+    static string symbol() {return string(1, 'a');}
+    static string prefix()  {return string("atto");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<atto, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'a');}
+    static u16string prefix()  {return u16string(u"atto");}
+};
+
+template <>
+struct ratio_string<atto, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'a');}
+    static u32string prefix()  {return u32string(U"atto");}
+};
+
+#endif
+
+template <>
+struct ratio_string<atto, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'a');}
+    static wstring prefix()  {return wstring(L"atto");}
+};
+
+// femto
+
+template <>
+struct ratio_string<femto, char>
+{
+    static string symbol() {return string(1, 'f');}
+    static string prefix()  {return string("femto");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<femto, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'f');}
+    static u16string prefix()  {return u16string(u"femto");}
+};
+
+template <>
+struct ratio_string<femto, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'f');}
+    static u32string prefix()  {return u32string(U"femto");}
+};
+
+#endif
+
+template <>
+struct ratio_string<femto, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'f');}
+    static wstring prefix()  {return wstring(L"femto");}
+};
+
+// pico
+
+template <>
+struct ratio_string<pico, char>
+{
+    static string symbol() {return string(1, 'p');}
+    static string prefix()  {return string("pico");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<pico, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'p');}
+    static u16string prefix()  {return u16string(u"pico");}
+};
+
+template <>
+struct ratio_string<pico, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'p');}
+    static u32string prefix()  {return u32string(U"pico");}
+};
+
+#endif
+
+template <>
+struct ratio_string<pico, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'p');}
+    static wstring prefix()  {return wstring(L"pico");}
+};
+
+// nano
+
+template <>
+struct ratio_string<nano, char>
+{
+    static string symbol() {return string(1, 'n');}
+    static string prefix()  {return string("nano");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<nano, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'n');}
+    static u16string prefix()  {return u16string(u"nano");}
+};
+
+template <>
+struct ratio_string<nano, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'n');}
+    static u32string prefix()  {return u32string(U"nano");}
+};
+
+#endif
+
+template <>
+struct ratio_string<nano, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'n');}
+    static wstring prefix()  {return wstring(L"nano");}
+};
+
+// micro
+
+template <>
+struct ratio_string<micro, char>
+{
+    static string symbol() {return string("\xC2\xB5");}
+    static string prefix()  {return string("micro");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<micro, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'\xB5');}
+    static u16string prefix()  {return u16string(u"micro");}
+};
+
+template <>
+struct ratio_string<micro, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'\xB5');}
+    static u32string prefix()  {return u32string(U"micro");}
+};
+
+#endif
+
+template <>
+struct ratio_string<micro, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'\xB5');}
+    static wstring prefix()  {return wstring(L"micro");}
+};
+
+// milli
+
+template <>
+struct ratio_string<milli, char>
+{
+    static string symbol() {return string(1, 'm');}
+    static string prefix()  {return string("milli");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<milli, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'm');}
+    static u16string prefix()  {return u16string(u"milli");}
+};
+
+template <>
+struct ratio_string<milli, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'm');}
+    static u32string prefix()  {return u32string(U"milli");}
+};
+
+#endif
+
+template <>
+struct ratio_string<milli, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'm');}
+    static wstring prefix()  {return wstring(L"milli");}
+};
+
+// centi
+
+template <>
+struct ratio_string<centi, char>
+{
+    static string symbol() {return string(1, 'c');}
+    static string prefix()  {return string("centi");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<centi, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'c');}
+    static u16string prefix()  {return u16string(u"centi");}
+};
+
+template <>
+struct ratio_string<centi, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'c');}
+    static u32string prefix()  {return u32string(U"centi");}
+};
+
+#endif
+
+template <>
+struct ratio_string<centi, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'c');}
+    static wstring prefix()  {return wstring(L"centi");}
+};
+
+// deci
+
+template <>
+struct ratio_string<deci, char>
+{
+    static string symbol() {return string(1, 'd');}
+    static string prefix()  {return string("deci");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<deci, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'd');}
+    static u16string prefix()  {return u16string(u"deci");}
+};
+
+template <>
+struct ratio_string<deci, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'd');}
+    static u32string prefix()  {return u32string(U"deci");}
+};
+
+#endif
+
+template <>
+struct ratio_string<deci, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'd');}
+    static wstring prefix()  {return wstring(L"deci");}
+};
+
+// deca
+
+template <>
+struct ratio_string<deca, char>
+{
+    static string symbol() {return string("da");}
+    static string prefix()  {return string("deca");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<deca, char16_t>
+{
+    static u16string symbol() {return u16string(u"da");}
+    static u16string prefix()  {return u16string(u"deca");}
+};
+
+template <>
+struct ratio_string<deca, char32_t>
+{
+    static u32string symbol() {return u32string(U"da");}
+    static u32string prefix()  {return u32string(U"deca");}
+};
+
+#endif
+
+template <>
+struct ratio_string<deca, wchar_t>
+{
+    static wstring symbol() {return wstring(L"da");}
+    static wstring prefix()  {return wstring(L"deca");}
+};
+
+// hecto
+
+template <>
+struct ratio_string<hecto, char>
+{
+    static string symbol() {return string(1, 'h');}
+    static string prefix()  {return string("hecto");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<hecto, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'h');}
+    static u16string prefix()  {return u16string(u"hecto");}
+};
+
+template <>
+struct ratio_string<hecto, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'h');}
+    static u32string prefix()  {return u32string(U"hecto");}
+};
+
+#endif
+
+template <>
+struct ratio_string<hecto, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'h');}
+    static wstring prefix()  {return wstring(L"hecto");}
+};
+
+// kilo
+
+template <>
+struct ratio_string<kilo, char>
+{
+    static string symbol() {return string(1, 'k');}
+    static string prefix()  {return string("kilo");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<kilo, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'k');}
+    static u16string prefix()  {return u16string(u"kilo");}
+};
+
+template <>
+struct ratio_string<kilo, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'k');}
+    static u32string prefix()  {return u32string(U"kilo");}
+};
+
+#endif
+
+template <>
+struct ratio_string<kilo, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'k');}
+    static wstring prefix()  {return wstring(L"kilo");}
+};
+
+// mega
+
+template <>
+struct ratio_string<mega, char>
+{
+    static string symbol() {return string(1, 'M');}
+    static string prefix()  {return string("mega");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<mega, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'M');}
+    static u16string prefix()  {return u16string(u"mega");}
+};
+
+template <>
+struct ratio_string<mega, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'M');}
+    static u32string prefix()  {return u32string(U"mega");}
+};
+
+#endif
+
+template <>
+struct ratio_string<mega, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'M');}
+    static wstring prefix()  {return wstring(L"mega");}
+};
+
+// giga
+
+template <>
+struct ratio_string<giga, char>
+{
+    static string symbol() {return string(1, 'G');}
+    static string prefix()  {return string("giga");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<giga, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'G');}
+    static u16string prefix()  {return u16string(u"giga");}
+};
+
+template <>
+struct ratio_string<giga, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'G');}
+    static u32string prefix()  {return u32string(U"giga");}
+};
+
+#endif
+
+template <>
+struct ratio_string<giga, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'G');}
+    static wstring prefix()  {return wstring(L"giga");}
+};
+
+// tera
+
+template <>
+struct ratio_string<tera, char>
+{
+    static string symbol() {return string(1, 'T');}
+    static string prefix()  {return string("tera");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<tera, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'T');}
+    static u16string prefix()  {return u16string(u"tera");}
+};
+
+template <>
+struct ratio_string<tera, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'T');}
+    static u32string prefix()  {return u32string(U"tera");}
+};
+
+#endif
+
+template <>
+struct ratio_string<tera, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'T');}
+    static wstring prefix()  {return wstring(L"tera");}
+};
+
+// peta
+
+template <>
+struct ratio_string<peta, char>
+{
+    static string symbol() {return string(1, 'P');}
+    static string prefix()  {return string("peta");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<peta, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'P');}
+    static u16string prefix()  {return u16string(u"peta");}
+};
+
+template <>
+struct ratio_string<peta, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'P');}
+    static u32string prefix()  {return u32string(U"peta");}
+};
+
+#endif
+
+template <>
+struct ratio_string<peta, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'P');}
+    static wstring prefix()  {return wstring(L"peta");}
+};
+
+// exa
+
+template <>
+struct ratio_string<exa, char>
+{
+    static string symbol() {return string(1, 'E');}
+    static string prefix()  {return string("exa");}
+};
+
+#if HAS_UNICODE_SUPPORT
+
+template <>
+struct ratio_string<exa, char16_t>
+{
+    static u16string symbol() {return u16string(1, u'E');}
+    static u16string prefix()  {return u16string(u"exa");}
+};
+
+template <>
+struct ratio_string<exa, char32_t>
+{
+    static u32string symbol() {return u32string(1, U'E');}
+    static u32string prefix()  {return u32string(U"exa");}
+};
+
+#endif
+
+template <>
+struct ratio_string<exa, wchar_t>
+{
+    static wstring symbol() {return wstring(1, L'E');}
+    static wstring prefix()  {return wstring(L"exa");}
+};
+
+//_LIBCPP_END_NAMESPACE_STD
+}
+
+#endif  // _RATIO_IO
--- a/src/beast/beast/config/CompilerConfig.h
+++ b/src/beast/beast/config/CompilerConfig.h
@@ -30,6 +30,8 @@
 #error "PlatformConfig.h must come first!"
 #endif

+#include <assert.h>
+
 // This file defines miscellaneous macros for debugging, assertions, etc.

 #if BEAST_FORCE_DEBUG
@@ -109,6 +111,7 @@ extern void beast_reportFatalError (char const* message, char const* fileName, i
 */
 #define BDBG(dbgtext)          { beast::String tempDbgBuf; tempDbgBuf << dbgtext; beast::Logger::outputDebugString (tempDbgBuf); }

+#if 0
 /** This will always cause an assertion failure.
    It is only compiled in a debug build, (unless BEAST_LOG_ASSERTIONS is enabled for your build).
    @see bassert
@@ -122,6 +125,11 @@ extern void beast_reportFatalError (char const* message, char const* fileName, i
    @see bassertfalse
  */
 #define bassert(expression)   { if (! (expression)) beast_reportFatalError(#expression,__FILE__,__LINE__); }
+#else
+
+#define bassertfalse assert(false)
+#define bassert(expression) assert(expression)
+#endif

 #else

--- a/src/beast/beast/config/ConfigCheck.h
+++ b/src/beast/beast/config/ConfigCheck.h
@@ -81,6 +81,10 @@
 #define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
 #endif

+#ifndef BEAST_SQLITE_FORCE_NDEBUG
+#define BEAST_SQLITE_FORCE_NDEBUG 0
+#endif
+
 #ifndef BEAST_STRING_UTF_TYPE
 #define BEAST_STRING_UTF_TYPE 8
 #endif
--- a/src/beast/beast/config/PlatformConfig.h
+++ b/src/beast/beast/config/PlatformConfig.h
@@ -174,7 +174,6 @@

 #ifdef __clang__
 #define BEAST_CLANG 1
- #define BEAST_GCC 1
 #elif defined (__GNUC__)
  #define BEAST_GCC 1
 #elif defined (_MSC_VER)
--- a/src/beast/beast/config/compiler/VisualC.h
+++ b/src/beast/beast/config/compiler/VisualC.h
@@ -18,3 +18,7 @@
 //==============================================================================

 // Microsoft Visual C++ compiler configuration
+
+#ifndef noexcept
+# define noexcept throw()
+#endif
--- a/src/beast/modules/beast_crypto/beast_crypto.cpp
+++ b/src/beast/modules/beast_crypto/beast_crypto.cpp
@@ -19,12 +19,7 @@

 #include "BeastConfig.h"

-#include "beast_crypto.h"
+#include "impl/aged_associative_container.cpp"

-namespace beast
-{
+#include "tests/buffer_view.test.cpp"

-#include "math/BinaryEncoding.cpp"
-#include "math/UnsignedInteger.cpp"
-
-}
--- a/src/beast/beast/container/aged_container.h
+++ b/src/beast/beast/container/aged_container.h
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_CONTAINER_H_INCLUDED
+#define BEAST_CONTAINER_AGED_CONTAINER_H_INCLUDED
+
+#include <type_traits>
+
+namespace beast {
+
+template <class T>
+struct is_aged_container
+    : std::false_type
+{
+};
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_container_utility.h
+++ b/src/beast/beast/container/aged_container_utility.h
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
+#define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED
+
+#include "aged_container.h"
+
+#include <type_traits>
+
+namespace beast {
+
+/** Expire aged container items past the specified age. */
+template <class AgedContainer, class Rep, class Period>
+typename std::enable_if <
+    is_aged_container <AgedContainer>::value,
+    std::size_t
+>::type
+expire (AgedContainer& c, std::chrono::duration <Rep, Period> const& age)
+{
+    std::size_t n (0);
+    auto const expired (c.clock().now() - age);
+    for (auto iter (c.chronological.cbegin());
+        iter != c.chronological.cend() &&
+            iter.when() <= expired;)
+    {
+        iter = c.erase (iter);
+        ++n;
+    }
+    return n;
+}
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_map.h
+++ b/src/beast/beast/container/aged_map.h
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED
+#define BEAST_CONTAINER_AGED_MAP_H_INCLUDED
+
+#include "detail/aged_ordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class T,
+    class Duration = std::chrono::seconds,
+    class Compare = std::less <Key>,
+    class Allocator = std::allocator <std::pair <Key const, T>>
+>
+using aged_map = detail::aged_ordered_container <
+    false, true, Key, T, Duration, Compare, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_multimap.h
+++ b/src/beast/beast/container/aged_multimap.h
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
+#define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED
+
+#include "detail/aged_ordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class T,
+    class Duration = std::chrono::seconds,
+    class Compare = std::less <Key>,
+    class Allocator = std::allocator <std::pair <Key const, T>>
+>
+using aged_multimap = detail::aged_ordered_container <
+    true, true, Key, T, Duration, Compare, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_multiset.h
+++ b/src/beast/beast/container/aged_multiset.h
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
+#define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED
+
+#include "detail/aged_ordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class Duration = std::chrono::seconds,
+    class Compare = std::less <Key>,
+    class Allocator = std::allocator <Key>
+>
+using aged_multiset = detail::aged_ordered_container <
+    true, false, Key, void, Duration, Compare, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_set.h
+++ b/src/beast/beast/container/aged_set.h
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED
+#define BEAST_CONTAINER_AGED_SET_H_INCLUDED
+
+#include "detail/aged_ordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class Duration = std::chrono::seconds,
+    class Compare = std::less <Key>,
+    class Allocator = std::allocator <Key>
+>
+using aged_set = detail::aged_ordered_container <
+    false, false, Key, void, Duration, Compare, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_unordered_map.h
+++ b/src/beast/beast/container/aged_unordered_map.h
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
+#define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED
+
+#include "detail/aged_unordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class T,
+    class Duration = std::chrono::seconds,
+    class Hash = std::hash <Key>,
+    class KeyEqual = std::equal_to <Key>,
+    class Allocator = std::allocator <std::pair <Key const, T>>
+>
+using aged_unordered_map = detail::aged_unordered_container <
+    false, true, Key, T, Duration, Hash, KeyEqual, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_unordered_multimap.h
+++ b/src/beast/beast/container/aged_unordered_multimap.h
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
+#define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED
+
+#include "detail/aged_unordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class T,
+    class Duration = std::chrono::seconds,
+    class Hash = std::hash <Key>,
+    class KeyEqual = std::equal_to <Key>,
+    class Allocator = std::allocator <std::pair <Key const, T>>
+>
+using aged_unordered_multimap = detail::aged_unordered_container <
+    true, true, Key, T, Duration, Hash, KeyEqual, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_unordered_multiset.h
+++ b/src/beast/beast/container/aged_unordered_multiset.h
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
+#define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED
+
+#include "detail/aged_unordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class Duration = std::chrono::seconds,
+    class Hash = std::hash <Key>,
+    class KeyEqual = std::equal_to <Key>,
+    class Allocator = std::allocator <Key>
+>
+using aged_unordered_multiset = detail::aged_unordered_container <
+    true, false, Key, void, Duration, Hash, KeyEqual, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/aged_unordered_set.h
+++ b/src/beast/beast/container/aged_unordered_set.h
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
+#define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED
+
+#include "detail/aged_unordered_container.h"
+
+#include <chrono>
+#include <functional>
+#include <memory>
+
+namespace beast {
+
+template <
+    class Key,
+    class Duration = std::chrono::seconds,
+    class Hash = std::hash <Key>,
+    class KeyEqual = std::equal_to <Key>,
+    class Allocator = std::allocator <Key>
+>
+using aged_unordered_set = detail::aged_unordered_container <
+    false, false, Key, void, Duration, Hash, KeyEqual, Allocator>;
+
+}
+
+#endif
--- a/src/beast/beast/container/buffer_view.h
+++ b/src/beast/beast/container/buffer_view.h
@@ -0,0 +1,519 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
+#define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED
+
+#include "../Config.h"
+
+#include "../cxx14/algorithm.h" // <algorithm>
+#include <cstddef>
+#include <iterator>
+#include <memory>
+#include <string>
+#include <vector>
+#include "../cxx14/type_traits.h" // <type_traits>
+
+namespace beast {
+
+namespace detail {
+
+template <class T, class U,
+    bool = std::is_const <std::remove_reference_t <T>>::value>
+struct apply_const
+{
+    typedef U type;
+};
+
+template <class T, class U>
+struct apply_const <T, U, true>
+{
+    typedef const U type;
+};
+
+// is_contiguous is true if C is a contiguous container
+template <class C>
+struct is_contiguous
+    : public std::false_type
+{
+};
+
+template <class C>
+struct is_contiguous <C const>
+    : public is_contiguous <C>
+{
+};
+
+template <class T, class Alloc>
+struct is_contiguous <std::vector <T, Alloc>>
+    : public std::true_type
+{
+};
+
+template <class CharT, class Traits, class Alloc>
+struct is_contiguous <std::basic_string<
+    CharT, Traits, Alloc>>
+    : public std::true_type
+{
+};
+
+template <class T, std::size_t N>
+struct is_contiguous <std::array<T, N>>
+    : public std::true_type
+{
+};
+
+// True if T is const or U is not const
+template <class T, class U>
+struct buffer_view_const_compatible : std::integral_constant <bool,
+    std::is_const<T>::value || ! std::is_const<U>::value
+>
+{
+};
+
+// True if T and U are the same or differ only in const, or
+// if T and U are equally sized integral types.
+template <class T, class U>
+struct buffer_view_ptr_compatible : std::integral_constant <bool,
+    (std::is_same <std::remove_const <T>, std::remove_const <U>>::value) ||
+        (std::is_integral <T>::value && std::is_integral <U>::value &&
+            sizeof (U) == sizeof (T))
+>
+{
+};
+
+// Determine if buffer_view <T, ..> is constructible from U*
+template <class T, class U>
+struct buffer_view_convertible : std::integral_constant <bool,
+    buffer_view_const_compatible <T, U>::value &&
+        buffer_view_ptr_compatible <T, U>::value
+>
+{
+};
+
+// True if C is a container that can be used to construct a buffer_view<T>
+template <class T, class C>
+struct buffer_view_container_compatible : std::integral_constant <bool,
+    is_contiguous <C>::value && buffer_view_convertible <T,
+        typename apply_const <C, typename C::value_type>::type>::value
+>
+{
+};
+
+} // detail
+
+struct buffer_view_default_tag
+{
+};
+
+//------------------------------------------------------------------------------
+
+/** A view into a range of contiguous container elements.
+
+    The size of the view is determined at the time of construction.
+    This tries to emulate the interface of std::vector as closely as possible,
+    with the constraint that the size of the container cannot be changed.
+
+    @tparam T The underlying element type. If T is const, member functions
+              which can modify elements are removed from the interface.
+
+    @tparam Tag A type used to prevent two views with the same T from being
+                comparable or assignable.
+*/
+template <
+    class T,
+    class Tag = buffer_view_default_tag
+>
+class buffer_view
+{
+private:
+    T* m_base;
+    std::size_t m_size;
+
+    static_assert (std::is_same <T, std::remove_reference_t <T>>::value,
+        "T may not be a reference type");
+
+    static_assert (! std::is_same <T, void>::value,
+        "T may not be void");
+
+    static_assert (std::is_same <std::add_const_t <T>,
+        std::remove_reference_t <T> const>::value,
+            "Expected std::add_const to produce T const");
+
+    template <class Iter>
+    void
+    assign (Iter first, Iter last) noexcept
+    {
+        typedef typename std::iterator_traits <Iter>::value_type U;
+
+        static_assert (detail::buffer_view_const_compatible <T, U>::value,
+            "Cannot convert from 'U const' to 'T', "
+                "conversion loses const qualifiers");
+
+        static_assert (detail::buffer_view_ptr_compatible <T, U>::value,
+            "Cannot convert from 'U*' to 'T*, "
+                "types are incompatible");
+
+        if (first == last)
+        {
+            m_base = nullptr;
+            m_size = 0;
+        }
+        else
+        {
+        #if 0
+            // fails on gcc
+            m_base = reinterpret_cast <T*> (
+                std::addressof (*first));
+        #else
+            m_base = reinterpret_cast <T*> (&*first);
+        #endif
+            m_size = std::distance (first, last);
+        }
+    }
+
+public:
+    typedef T value_type;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+    typedef T& reference;
+    typedef T const& const_reference;
+    typedef T* pointer;
+    typedef T const* const_pointer;
+    typedef T* iterator;
+    typedef T const* const_iterator;
+    typedef std::reverse_iterator <iterator> reverse_iterator;
+    typedef std::reverse_iterator <const_iterator> const_reverse_iterator;
+
+    // default construct
+    buffer_view () noexcept
+        : m_base (nullptr)
+        , m_size (0)
+    {
+    }
+
+    // copy construct
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (buffer_view <U, Tag> v) noexcept
+    {
+        assign (v.begin(), v.end());
+    }
+
+    // construct from container
+    template <class C,
+        class = std::enable_if_t <
+            detail::buffer_view_container_compatible <T, C>::value
+        >
+    >
+    buffer_view (C& c) noexcept
+    {
+        assign (c.begin(), c.end());
+    }
+
+    // construct from pointer range
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (U* first, U* last) noexcept
+    {
+        assign (first, last);
+    }
+
+    // construct from base and size
+    template <class U,
+        class = std::enable_if_t <
+            detail::buffer_view_convertible <T, U>::value>
+    >
+    buffer_view (U* u, std::size_t n) noexcept
+        : m_base (u)
+        , m_size (n)
+    {
+    }
+
+    // assign from container
+    template <class C,
+        class = std::enable_if_t <
+            detail::buffer_view_container_compatible <T, C>::value
+        >
+    >
+    buffer_view&
+    operator= (C& c) noexcept
+    {
+        assign (c.begin(), c.end());
+        return *this;
+    }
+
+    //
+    // Element access
+    //
+
+    reference
+    at (size_type pos)
+    {
+        if (! (pos < size()))
+            throw std::out_of_range ("bad array index");
+        return m_base [pos];
+    }
+
+    const_reference
+    at (size_type pos) const
+    {
+        if (! (pos < size()))
+            throw std::out_of_range ("bad array index");
+        return m_base [pos];
+    }
+
+    reference
+    operator[] (size_type pos) noexcept
+    {
+        return m_base [pos];
+    }
+
+    const_reference
+    operator[] (size_type pos) const noexcept
+    {
+        return m_base [pos];
+    }
+
+    reference
+    back() noexcept
+    {
+        return m_base [m_size - 1];
+    }
+
+    const_reference
+    back() const noexcept
+    {
+        return m_base [m_size - 1];
+    }
+
+    reference
+    front() noexcept
+    {
+        return *m_base;
+    }
+
+    const_reference
+    front() const noexcept
+    {
+        return *m_base;
+    }
+
+    pointer
+    data() noexcept
+    {
+        return m_base;
+    }
+
+    const_pointer
+    data() const noexcept
+    {
+        return m_base;
+    }
+
+    //
+    // Iterators
+    //
+
+    iterator
+    begin() noexcept
+    {
+        return m_base;
+    }
+
+    const_iterator
+    begin() const noexcept
+    {
+        return m_base;
+    }
+
+    const_iterator
+    cbegin() const noexcept
+    {
+        return m_base;
+    }
+
+    iterator
+    end() noexcept
+    {
+        return m_base + m_size;
+    }
+
+    const_iterator
+    end() const noexcept
+    {
+        return m_base + m_size;
+    }
+
+    const_iterator
+    cend() const noexcept
+    {
+        return m_base + m_size;
+    }
+
+    reverse_iterator
+    rbegin() noexcept
+    {
+        return reverse_iterator (end());
+    }
+
+    const_reverse_iterator
+    rbegin() const noexcept
+    {
+        return const_reverse_iterator (cend());
+    }
+
+    const_reverse_iterator
+    crbegin() const noexcept
+    {
+        return const_reverse_iterator (cend());
+    }
+
+    reverse_iterator
+    rend() noexcept
+    {
+        return reverse_iterator (begin());
+    }
+
+    const_reverse_iterator
+    rend() const noexcept
+    {
+        return const_reverse_iterator (cbegin());
+    }
+
+    const_reverse_iterator
+    crend() const noexcept
+    {
+        return const_reverse_iterator (cbegin());
+    }
+
+    //
+    // Capacity
+    //
+
+    bool
+    empty() const noexcept
+    {
+        return m_size == 0;
+    }
+
+    size_type
+    size() const noexcept
+    {
+        return m_size;
+    }
+
+    size_type
+    max_size() const noexcept
+    {
+        return size();
+    }
+
+    size_type
+    capacity() const noexcept
+    {
+        return size();
+    }
+
+    //
+    // Modifiers
+    //
+
+    template <class U, class K>
+    friend void swap (buffer_view <U, K>& lhs,
+        buffer_view <U, K>& rhs) noexcept;
+};
+
+//------------------------------------------------------------------------------
+
+template <class T, class Tag>
+inline
+bool
+operator== (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return std::equal (
+        lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend());
+}
+
+template <class T, class Tag>
+inline
+bool
+operator!= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (lhs == rhs);
+}
+
+template <class T, class Tag>
+inline
+bool
+operator< (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return std::lexicographical_compare (
+        lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend());
+}
+
+template <class T, class Tag>
+inline
+bool
+operator>= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (lhs < rhs);
+}
+
+template <class T, class Tag>
+inline
+bool
+operator> (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return rhs < lhs;
+}
+
+template <class T, class Tag>
+inline
+bool
+operator<= (buffer_view <T, Tag> lhs, buffer_view <T, Tag> rhs)
+{
+    return ! (rhs < lhs);
+}
+
+template <class T, class Tag>
+inline
+void
+swap (buffer_view <T, Tag>& lhs, buffer_view <T, Tag>& rhs) noexcept
+{
+    std::swap (lhs.m_base, rhs.m_base);
+    std::swap (lhs.m_size, rhs.m_size);
+}
+
+//------------------------------------------------------------------------------
+
+template <
+    class T,
+    class Tag = buffer_view_default_tag
+>
+using const_buffer_view = buffer_view <
+    std::add_const_t <T>, Tag>;
+
+}
+
+#endif
--- a/src/beast/beast/container/detail/aged_associative_container.h
+++ b/src/beast/beast/container/detail/aged_associative_container.h
@@ -0,0 +1,54 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
+#define BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED
+
+#include <type_traits>
+
+namespace beast {
+namespace detail {
+
+// Extracts the key portion of value
+template <bool maybe_map>
+struct aged_associative_container_extract_t
+{
+    template <class Value>
+    decltype (Value::first) const&
+    operator() (Value const& value) const
+    {
+        return value.first;
+    }
+};
+
+template <>
+struct aged_associative_container_extract_t <false>
+{
+    template <class Value>
+    Value const&
+    operator() (Value const& value) const
+    {
+        return value;
+    }
+};
+
+}
+}
+
+#endif
--- a/src/beast/beast/container/detail/aged_container_iterator.h
+++ b/src/beast/beast/container/detail/aged_container_iterator.h
@@ -0,0 +1,156 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED
+#define BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED
+
+#include <iterator>
+#include <type_traits>
+
+namespace beast {
+
+template <bool, bool, class, class, class, class, class>
+class aged_ordered_container;
+
+namespace detail {
+
+// Idea for Base template argument to prevent having to repeat
+// the base class declaration comes from newbiz on ##c++/Freenode
+//
+// If Iterator is SCARY then this iterator will be as well.
+template <
+    bool is_const,
+    class Iterator,
+    class Base = 
+        std::iterator <
+            typename std::iterator_traits <Iterator>::iterator_category,
+            typename std::conditional <is_const,
+                typename Iterator::value_type::stashed::value_type const,
+                typename Iterator::value_type::stashed::value_type>::type,
+            typename std::iterator_traits <Iterator>::difference_type>
+>
+class aged_container_iterator
+    : public Base
+{
+public:
+    typedef typename Iterator::value_type::stashed::time_point time_point;
+
+    aged_container_iterator ()
+    {
+    }
+
+    template <class OtherIterator, class OtherBase>
+    aged_container_iterator (aged_container_iterator <
+        false, OtherIterator, OtherBase> const& other)
+        : m_iter (other.m_iter)
+    {
+    }
+
+    template <bool other_is_const, class OtherIterator, class OtherBase>
+    aged_container_iterator& operator= (aged_container_iterator <
+        other_is_const, OtherIterator, OtherBase> const& other)
+    {
+        m_iter = other.m_iter;
+        return *this;
+    }
+
+    template <bool other_is_const, class OtherIterator, class OtherBase>
+    bool operator== (aged_container_iterator <
+        other_is_const, OtherIterator, OtherBase> const& other) const
+    {
+        return m_iter == other.m_iter;
+    }
+
+    template <bool other_is_const, class OtherIterator, class OtherBase>
+    bool operator!= (aged_container_iterator <
+        other_is_const, OtherIterator, OtherBase> const& other) const
+    {
+        return m_iter != other.m_iter;
+    }
+
+    aged_container_iterator& operator++ ()
+    {
+        ++m_iter;
+        return *this;
+    }
+
+    aged_container_iterator operator++ (int)
+    {
+        aged_container_iterator const prev (*this);
+        ++m_iter;
+        return prev;
+    }
+
+    aged_container_iterator& operator-- ()
+    {
+        --m_iter;
+        return *this;
+    }
+
+    aged_container_iterator operator-- (int)
+    {
+        aged_container_iterator const prev (*this);
+        --m_iter;
+        return prev;
+    }
+
+    typename Base::reference operator* () const
+    {
+        return m_iter->value;
+    }
+
+    typename Base::pointer operator-> () const
+    {
+        return &m_iter->value;
+    }
+
+    time_point const& when () const
+    {
+        return m_iter->when;
+    }
+
+private:
+    template <bool, bool, class, class, class, class, class>
+    friend class aged_ordered_container;
+
+    template <bool, bool, class, class, class, class, class, class>
+    friend class aged_unordered_container;
+
+    template <bool, class, class>
+    friend class aged_container_iterator;
+
+    template <class OtherIterator>
+    aged_container_iterator (OtherIterator const& iter)
+        : m_iter (iter)
+    {
+    }
+
+    Iterator const& iterator() const
+    {
+        return m_iter;
+    }
+
+    Iterator m_iter;
+};
+
+}
+
+}
+
+#endif
--- a/src/beast/beast/container/detail/aged_ordered_container.h
+++ b/src/beast/beast/container/detail/aged_ordered_container.h
--- a/src/beast/beast/container/detail/aged_unordered_container.h
+++ b/src/beast/beast/container/detail/aged_unordered_container.h
--- a/src/beast/beast/container/impl/aged_associative_container.cpp
+++ b/src/beast/beast/container/impl/aged_associative_container.cpp
--- a/src/beast/beast/container/tests/buffer_view.test.cpp
+++ b/src/beast/beast/container/tests/buffer_view.test.cpp
@@ -0,0 +1,323 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../../../modules/beast_core/beast_core.h" // for UnitTest
+#include "../buffer_view.h"
+
+#include "../../cxx14/algorithm.h" // <algorithm>
+
+namespace beast {
+
+class buffer_view_Tests : public UnitTest
+{
+public:
+    // Returns `true` if the iterator distance matches the size
+    template <class FwdIt, class Size>
+    static bool eq_dist (FwdIt first, FwdIt last, Size size)
+    {
+        auto const dist (std::distance (first, last));
+        
+        static_assert (std::is_signed <decltype (dist)>::value,
+            "dist must be signed");
+        
+        if (dist < 0)
+            return false;
+
+        return static_cast <Size> (dist) == size;
+    }
+
+    // Check the contents of a buffer_view against the container
+    template <class C, class T>
+    void check (C const& c, buffer_view <T> v)
+    {
+        expect (! v.empty() || c.empty());
+        expect (v.size() == c.size());
+        expect (v.max_size() == v.size());
+        expect (v.capacity() == v.size());
+
+        expect (eq_dist (v.begin(), v.end(), v.size()));
+        expect (eq_dist (v.cbegin(), v.cend(), v.size()));
+        expect (eq_dist (v.rbegin(), v.rend(), v.size()));
+        expect (eq_dist (v.crbegin(), v.crend(), v.size()));
+
+        expect (std::equal (
+            c.cbegin(), c.cend(), v.cbegin(), v.cend()));
+
+        expect (std::equal (
+            c.crbegin(), c.crend(), v.crbegin(), v.crend()));
+
+        if (v.size() == c.size())
+        {
+            if (! v.empty())
+            {
+                expect (v.front() == c.front());
+                expect (v.back() == c.back());
+            }
+
+            for (std::size_t i (0); i < v.size(); ++i)
+                expect (v[i] == c[i]);
+        }
+    }
+
+    //--------------------------------------------------------------------------
+
+    // Call at() with an invalid index
+    template <class V>
+    void checkBadIndex (V& v,
+        std::enable_if_t <
+            std::is_const <typename V::value_type>::value>* = 0)
+    {
+        try
+        {
+            v.at(0);
+            fail();
+        }
+        catch (std::out_of_range e)
+        {
+            pass();
+        }
+        catch (...)
+        {
+            fail();
+        }
+    }
+
+    // Call at() with an invalid index
+    template <class V>
+    void checkBadIndex (V& v,
+        std::enable_if_t <
+            ! std::is_const <typename V::value_type>::value>* = 0)
+    {
+        try
+        {
+            v.at(0);
+            fail();
+        }
+        catch (std::out_of_range e)
+        {
+            pass();
+        }
+        catch (...)
+        {
+            fail();
+        }
+
+        try
+        {
+            v.at(0) = 1;
+            fail();
+        }
+        catch (std::out_of_range e)
+        {
+            pass();
+        }
+        catch (...)
+        {
+            fail();
+        }
+    }
+
+    // Checks invariants for an empty buffer_view
+    template <class V>
+    void checkEmpty (V& v)
+    {
+        expect (v.empty());
+        expect (v.size() == 0);
+        expect (v.max_size() == v.size());
+        expect (v.capacity() == v.size());
+        expect (v.begin() == v.end());
+        expect (v.cbegin() == v.cend());
+        expect (v.begin() == v.cend());
+        expect (v.rbegin() == v.rend());
+        expect (v.crbegin() == v.rend());
+
+        checkBadIndex (v);
+    }
+
+    // Test empty containers
+    void testEmpty()
+    {
+        beginTestCase ("empty");
+
+        buffer_view <char> v1;
+        checkEmpty (v1);
+
+        buffer_view <char> v2;
+        swap (v1, v2);
+        checkEmpty (v1);
+        checkEmpty (v2);
+
+        buffer_view <char const> v3 (v2);
+        checkEmpty (v3);
+    }
+
+    //--------------------------------------------------------------------------
+
+    // Construct const views from a container
+    template <class C>
+    void testConstructConst (C const& c)
+    {
+        typedef buffer_view <std::add_const_t <
+            typename C::value_type>> V;
+
+        {
+            // construct from container
+            V v (c);
+            check (c, v);
+
+            // construct from buffer_view
+            V v2 (v);
+            check (c, v2);
+        }
+
+        if (! c.empty())
+        {
+            {
+                // construct from const pointer range
+                V v (&c.front(), &c.back()+1);
+                check (c, v);
+
+                // construct from pointer and size
+                V v2 (&c.front(), c.size());
+                check (v, v2);
+            }
+
+            {
+                // construct from non const pointer range
+                C cp (c);
+                V v (&cp.front(), &cp.back()+1);
+                check (cp, v);
+
+                // construct from pointer and size
+                V v2 (&cp.front(), cp.size());
+                check (v, v2);
+
+                // construct from data and size
+                V v3 (v2.data(), v2.size());
+                check (c, v3);
+            }
+        }
+    }
+
+    // Construct view from a container
+    template <class C>
+    void testConstruct (C const& c)
+    {
+        static_assert (! std::is_const <typename C::value_type>::value,
+            "Container value_type cannot be const");
+
+        testConstructConst (c);
+
+        typedef buffer_view <typename C::value_type> V;
+
+        C cp (c);
+        V v (cp);
+        check (cp, v);
+
+        std::reverse (v.begin(), v.end());
+        check (cp, v);
+
+        expect (std::equal (v.rbegin(), v.rend(),
+            c.begin(), c.end()));
+    }
+
+    void testConstruct()
+    {
+        beginTestCase ("std::vector <char>");
+        testConstruct (
+            std::vector <char> ({'h', 'e', 'l', 'l', 'o'}));
+
+        beginTestCase ("std::string <char>");
+        testConstruct (
+            std::basic_string <char> ("hello"));
+    }
+
+    //--------------------------------------------------------------------------
+
+    void testCoerce()
+    {
+        beginTestCase ("coerce");
+
+        std::string const s ("hello");
+        const_buffer_view <unsigned char> v (s);
+
+        pass();
+    }
+
+    //--------------------------------------------------------------------------
+
+    void testAssign()
+    {
+        beginTestCase ("testAssign");
+        std::vector <int> v1({1, 2, 3});
+        buffer_view<int> r1(v1);
+        std::vector <int> v2({4, 5, 6, 7});
+        buffer_view<int> r2(v2);
+        r1 = r2;
+        expect (std::equal (r1.begin(), r1.end(), v2.begin(), v2.end()));
+    }
+
+    //--------------------------------------------------------------------------
+
+    static_assert (std::is_constructible <buffer_view <int>,
+        std::vector <int>&>::value, "");
+
+    static_assert (!std::is_constructible <buffer_view <int>,
+        std::vector <int> const&>::value, "");
+
+    static_assert (std::is_constructible <buffer_view <int const>,
+        std::vector <int>&>::value, "");
+
+    static_assert (std::is_constructible <buffer_view <int const>,
+        std::vector <int> const&>::value, "");
+
+    static_assert (std::is_nothrow_default_constructible <
+        buffer_view <int>>::value, "");
+
+    static_assert (std::is_nothrow_destructible <
+        buffer_view <int>>::value, "");
+
+    static_assert (std::is_nothrow_copy_constructible <
+        buffer_view <int>>::value, "");
+
+    static_assert (std::is_nothrow_copy_assignable <
+        buffer_view<int>>::value, "");
+
+    static_assert (std::is_nothrow_move_constructible <
+        buffer_view <int>>::value, "");
+
+    static_assert (std::is_nothrow_move_assignable <
+        buffer_view <int>>::value, "");
+
+    void runTest()
+    {
+        testEmpty();
+        testConstruct();
+        testCoerce();
+        testAssign();
+    }
+
+    buffer_view_Tests() : UnitTest ("buffer_view", "beast")
+    {
+    }
+};
+
+static buffer_view_Tests buffer_view_tests;
+
+}
--- a/src/beast/modules/beast_crypto/math/BinaryEncoding.h
+++ b/src/beast/modules/beast_crypto/math/BinaryEncoding.h
@@ -20,5 +20,4 @@
 #ifndef BEAST_CRYPTO_BINARYENCODING_H_INCLUDED
 #define BEAST_CRYPTO_BINARYENCODING_H_INCLUDED

-
 #endif
--- a/src/beast/beast/crypto/Crypto.cpp
+++ b/src/beast/beast/crypto/Crypto.cpp
@@ -19,5 +19,9 @@

 #include "BeastConfig.h"

+#include "../../modules/beast_core/beast_core.h" // for UnitTest
+
+#include "impl/BinaryEncoding.cpp"
 #include "impl/MurmurHash.cpp"
 #include "impl/Sha256.cpp"
+#include "impl/UnsignedInteger.cpp"
--- a/src/beast/beast/crypto/Sha256.h
+++ b/src/beast/beast/crypto/Sha256.h
@@ -22,7 +22,8 @@

 #include "../Config.h"
 #include "../CStdInt.h"
-#include "../FixedArray.h"
+
+#include <array>

 //------------------------------------------------------------------------------

@@ -36,7 +37,7 @@ enum
 };

 /** A container suitable for holding the resulting hash. */
-typedef FixedArray <uint8, digestLength> digest_type;
+typedef std::array <uint8, digestLength> digest_type;

 namespace detail {
 struct Context
@@ -85,7 +86,7 @@ public:

    digest_type& finish (digest_type& digest)
    {
-        finish (digest.c_array());
+        finish (digest.data());
        return digest;
    }

--- a/src/beast/modules/beast_crypto/math/UnsignedInteger.h
+++ b/src/beast/modules/beast_crypto/math/UnsignedInteger.h
@@ -20,6 +20,15 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED

+#include "../SafeBool.h"
+#include "UnsignedIntegerCalc.h"
+#include "MurmurHash.h"
+
+#include <cstdint>
+#include <memory>
+
+namespace beast {
+
 /** Represents a set of bits of fixed size.

    The data is stored in "canonical" format which is network (big endian)
@@ -36,13 +45,13 @@ public:
    static std::size_t const size = Bytes;

    // The underlying integer type we use when converting to calculation format.
-    typedef uint32             IntCalcType;
+    typedef std::uint32_t IntCalcType;

    // The type of object resulting from a conversion to calculation format.
    typedef UnsignedIntegerCalc <IntCalcType> CalcType;

    // Standard container compatibility
-    typedef uint8              value_type;
+    typedef std::uint8_t value_type;
    typedef value_type*        iterator;
    typedef value_type const*  const_iterator;

@@ -135,7 +144,8 @@ public:
    template <class UnsignedIntegralType>
    static UnsignedInteger createFromInteger (UnsignedIntegralType value)
    {
-        static_bassert (Bytes >= sizeof (UnsignedIntegralType));
+        static_assert (Bytes >= sizeof (UnsignedIntegralType),
+            "Bytes is too small.");
        UnsignedInteger <Bytes> result;
        value = toNetworkByteOrder <UnsignedIntegralType> (value);
        result.clear ();
@@ -296,4 +306,6 @@ private:
    IntCalcType m_values [CalcCount];
 };

+}
+
 #endif
--- a/src/beast/modules/beast_crypto/math/UnsignedIntegerCalc.h
+++ b/src/beast/modules/beast_crypto/math/UnsignedIntegerCalc.h
@@ -20,22 +20,25 @@
 #ifndef BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED
 #define BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED

-namespace detail
-{
+#include <cstdint>
+
+namespace beast {
+
+namespace detail {

 template <typename UInt>
 struct DoubleWidthUInt;

 template <>
-struct DoubleWidthUInt <uint16>
+struct DoubleWidthUInt <std::uint16_t>
 {
-    typedef uint32 type;
+    typedef std::uint32_t type;
 };

 template <>
-struct DoubleWidthUInt <uint32>
+struct DoubleWidthUInt <std::uint32_t>
 {
-    typedef uint64 type;
+    typedef std::uint64_t type;
 };

 }
@@ -331,7 +334,7 @@ public:
            }
            *lhs++ = UInt (part);
        }
-        bassert (carry == 0) // overflow
+        bassert (carry == 0); // overflow
        return *this;
    }

@@ -427,4 +430,6 @@ private:
    UInt* m_values;
 };

+}
+
 #endif
--- a/src/beast/modules/beast_crypto/math/BinaryEncoding.cpp
+++ b/src/beast/modules/beast_crypto/math/BinaryEncoding.cpp
@@ -17,6 +17,14 @@
 */
 //==============================================================================

+#include "../BinaryEncoding.h"
+#include "../UnsignedInteger.h"
+
+#include <cstddef>
+#include <string>
+
+namespace beast {
+
 /** Generic algorithms for base encoding and decoding. */
 class BinaryEncoding
 {
@@ -393,3 +401,5 @@ public:
 };

 static BinaryEncodingTests BinaryEncodingTests;
+
+}
--- a/src/beast/beast/crypto/impl/Sha256.cpp
+++ b/src/beast/beast/crypto/impl/Sha256.cpp
@@ -88,7 +88,7 @@ void* hash (void const* buffer, std::size_t bytes, void* digest)

 digest_type& hash (void const* buffer, std::size_t bytes, digest_type& digest)
 {
-    hash (buffer, bytes, digest.c_array());
+    hash (buffer, bytes, digest.data());
    return digest;
 }

--- a/src/beast/modules/beast_crypto/math/UnsignedInteger.cpp
+++ b/src/beast/modules/beast_crypto/math/UnsignedInteger.cpp
@@ -3,6 +3,10 @@
    This file is part of Beast: https://github.com/vinniefalco/Beast
    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>

+    Portions are Copyright (c) 2013 the authors listed at the following URL,
+    and/or the authors of referenced articles or incorporated external code:
+    http://en.literateprograms.org/Arbitrary-precision_integer_arithmetic_(C)?action=history&offset=20100923155004
+
    Permission to use, copy, modify, and/or distribute this software for any
    purpose  with  or without fee is hereby granted, provided that the above
    copyright notice and this permission notice appear in all copies.
@@ -17,7 +21,13 @@
 */
 //==============================================================================

-//------------------------------------------------------------------------------
+#include "../UnsignedInteger.h"
+
+namespace beast {
+
+namespace multiprecsion {
+
+#if 0

 /*  Copyright (c) 2013 the authors listed at the following URL, and/or
    the authors of referenced articles or incorporated external code:
@@ -41,15 +51,11 @@
    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Retrieved from: http://en.literateprograms.org/Arbitrary-precision_integer_arithmetic_(C)?oldid=16902
 */

-namespace multiprecsion
-{
-
-#if 0
-//------------------------------------------------------------------------------
+//
+// Retrieved from: http://en.literateprograms.org/Arbitrary-precision_integer_arithmetic_(C)?oldid=16902
+//

 typedef unsigned short component_t;
 typedef unsigned long double_component_t;
@@ -394,3 +400,5 @@ private:
 };

 static UnsignedIntegerTests unsignedIntegerTests;
+
+}
--- a/src/beast/beast/cxx14/algorithm.h
+++ b/src/beast/beast/cxx14/algorithm.h
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CXX14_ALGORITHM_H_INCLUDED
+#define BEAST_CXX14_ALGORITHM_H_INCLUDED
+
+#include "config.h"
+#include "functional.h"
+
+#include <algorithm>
+
+namespace std {
+
+namespace detail {
+
+template <class Pred, class FwdIt1, class FwdIt2>
+bool equal (FwdIt1 first1, FwdIt1 last1,
+    FwdIt2 first2, FwdIt2 last2, Pred pred,
+        std::input_iterator_tag, std::input_iterator_tag)
+{
+    for (; first1 != last1 && first2 != last2; ++first1, ++first2)
+        if (! pred (*first1, *first2))
+            return false;
+    return first1 == last1 && first2 == last2;
+}
+
+template <class Pred, class RanIt1, class RanIt2>
+bool equal (RanIt1 first1, RanIt1 last1,
+    RanIt2 first2, RanIt2 last2, Pred pred,
+        random_access_iterator_tag,
+            random_access_iterator_tag )
+{
+    if (std::distance (first1, last1) !=
+            std::distance (first2, last2))
+        return false;
+    for (; first1 != last1; ++first1, ++first2)
+        if (! pred (*first1, *first2))
+            return false;
+    return true;
+}
+
+}
+
+/** C++14 implementation of std::equal. */
+/** @{ */
+template <class FwdIt1, class FwdIt2>
+bool equal (FwdIt1 first1, FwdIt1 last1,
+    FwdIt2 first2, FwdIt2 last2)
+{
+    return std::detail::equal (first1, last1,
+        first2, last2, std::equal_to <void>(),
+            typename std::iterator_traits <
+                FwdIt1>::iterator_category(),
+                    typename std::iterator_traits <
+                        FwdIt2>::iterator_category());
+}
+
+template <class FwdIt1, class FwdIt2, class Pred>
+bool equal (FwdIt1 first1, FwdIt1 last1,
+    FwdIt2 first2, FwdIt2 last2, Pred pred)
+{
+    return std::detail::equal <
+        typename std::add_lvalue_reference <Pred>::type> (
+            first1, last1, first2, last2, pred,
+                typename std::iterator_traits <
+                    FwdIt1>::iterator_category(),
+                        typename std::iterator_traits <
+                            FwdIt2>::iterator_category());
+}
+/** @} */
+
+}
+
+#endif
--- a/src/beast/modules/beast_extras/beast_extras.h
+++ b/src/beast/modules/beast_extras/beast_extras.h
@@ -17,27 +17,28 @@
 */
 //==============================================================================

-#ifndef BEAST_EXTRAS_H_INCLUDED
-#define BEAST_EXTRAS_H_INCLUDED
+#ifndef BEAST_CXX14_CONFIG_H_INCLUDED
+#define BEAST_CXX14_CONFIG_H_INCLUDED

-// Adds boost-specific features to beast.
+// Sets C++14 compatibility configuration macros based on build environment

-#include <boost/version.hpp>
-
-// lockable_traits was added in 1.53.0
-#ifndef BEAST_BOOST_HAS_LOCKABLES
-# if BOOST_VERSION >= 105300
-#  define BEAST_BOOST_HAS_LOCKABLES 1
+// Disables beast c++14 compatibility additions when set to 1
+//
+#ifndef BEAST_NO_CXX14_COMPATIBILITY
+# ifdef _MSC_VER
+#  define BEAST_NO_CXX14_COMPATIBILITY 1
 # else
-#  define BEAST_BOOST_HAS_LOCKABLES 0
+#  define BEAST_NO_CXX14_COMPATIBILITY 0
 # endif
 #endif
-#if BEAST_BOOST_HAS_LOCKABLES
-# include <boost/thread/lockable_traits.hpp>
-#endif

-#if BEAST_BOOST_HAS_LOCKABLES
-# include "traits/BoostLockableTraits.h"
+// Disables beast's make_unique
+#ifndef BEAST_NO_CXX14_MAKE_UNIQUE
+# ifdef _MSC_VER
+#  define BEAST_NO_CXX14_MAKE_UNIQUE 1
+# else
+#  define BEAST_NO_CXX14_MAKE_UNIQUE 0
+# endif
 #endif

 #endif
--- a/src/beast/beast/cxx14/cxx14.cpp
+++ b/src/beast/beast/cxx14/cxx14.cpp
@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "tests/integer_sequence.test.cpp"
--- a/src/beast/beast/cxx14/functional.h
+++ b/src/beast/beast/cxx14/functional.h
@@ -17,32 +17,37 @@
 */
 //==============================================================================

-#ifndef BEAST_UTILITY_ENABLEIF_H_INCLUDED
-#define BEAST_UTILITY_ENABLEIF_H_INCLUDED
+#ifndef BEAST_CXX14_FUNCTIONAL_H_INCLUDED
+#define BEAST_CXX14_FUNCTIONAL_H_INCLUDED

-#include "../type_traits/IntegralConstant.h"
+#include "config.h"

-namespace beast
+#include <functional>
+#include <type_traits>
+#include <utility>
+
+#if ! BEAST_NO_CXX14_COMPATIBILITY
+
+namespace std {
+
+// C++14 implementation of std::equal_to <void> specialization.
+// This supports heterogeneous comparisons.
+template <>
+struct equal_to <void>
 {
+    // VFALCO NOTE Its not clear how to support is_transparent pre c++14
+    typedef std::true_type is_transparent;

-template <bool Enable, class T = void>
-struct EnableIfBool : TrueType { typedef T type; };
-
-template <class T>
-struct EnableIfBool <false, T> : FalseType { };
-
-template <class Cond, class T = void>
-struct EnableIf : public EnableIfBool <Cond::value, T> { };
-
-template <bool Enable, class T = void>
-struct DisableIfBool : FalseType { typedef T type; };
-
-template <class T>
-struct DisableIfBool <true, T> { };
-
-template <class Cond, class T = void>
-struct DisableIf : public DisableIfBool <Cond::value, T> { };
+    template <class T, class U>
+    auto operator() (T&& lhs, U&& rhs) const ->
+        decltype (std::forward <T> (lhs) == std::forward <U> (rhs))
+    {
+        return std::forward <T> (lhs) == std::forward <U> (rhs);
+    }
+};

 }

 #endif
+
+#endif
--- a/src/beast/beast/cxx14/memory.h
+++ b/src/beast/beast/cxx14/memory.h
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_CXX14_MEMORY_H_INCLUDED
+#define BEAST_CXX14_MEMORY_H_INCLUDED
+
+#include "config.h"
+
+#include <memory>
+
+namespace std {
+
+#if ! BEAST_NO_CXX14_MAKE_UNIQUE
+template <class T, class... Args>
+std::unique_ptr <T> make_unique (Args&&... args)
+{
+    return std::unique_ptr <T> (new T (std::forward <Args> (args)...));
+}
+#endif
+
+}
+
+#endif
--- a/Show More
+++ b/Show More