Merge branch 'master' of github.com:JoelKatz/rippled

2026-06-07 10:47:05 +00:00 · 2013-08-06 09:08:34 -07:00
parent 5ce5634d8f c7ef04aa78
commit 73bf23d353
626 changed files with 57794 additions and 13266 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,25 @@ test/config.js

 # Doxygen generated documentation output
 HtmlDocumentation
+
+# Xcode user-specific project settings
+# Xcode
+.DS_Store
+*/build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+
+# Intel Parallel Studio 2013 XE
+My Amplifier XE Results - RippleD
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -1,25 +1,123 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>

-#ifndef BEAST_BEASTCONFIG_HEADER
-#define BEAST_BEASTCONFIG_HEADER
+    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.

-// beast_core flags:
+    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_FORCE_DEBUG
- //#define BEAST_FORCE_DEBUG
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+#define BEAST_BEASTCONFIG_H_INCLUDED
+
+/** Configuration file for Beast.
+
+    This sets various configurable options for Beast. In order to compile you
+    must place a copy of this file in a location where your build environment
+    can find it, and then customize its contents to suit your needs.
+
+    @file BeastConfig.h
+*/
+
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_FORCE_DEBUG
+
+    Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project
+    settings, but if you define this value, you can override this to force it
+    to be true or false.
+*/
+#ifndef   BEAST_FORCE_DEBUG
+//#define BEAST_FORCE_DEBUG 0
 #endif

-#ifndef    BEAST_LOG_ASSERTIONS
- //#define BEAST_LOG_ASSERTIONS 1
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_LOG_ASSERTIONS
+
+    If this flag is enabled, the the bassert and bassertfalse macros will always
+    use Logger::writeToLog() to write a message when an assertion happens.
+
+    Enabling it will also leave this turned on in release builds. When it's
+    disabled, however, the bassert and bassertfalse macros will not be compiled
+    in a release build.
+
+    @see bassert, bassertfalse, Logger
+*/
+#ifndef   BEAST_LOG_ASSERTIONS
+//#define BEAST_LOG_ASSERTIONS 0
 #endif

-#ifndef    BEAST_CHECK_MEMORY_LEAKS
- //#define BEAST_CHECK_MEMORY_LEAKS
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_CHECK_MEMORY_LEAKS
+
+    Enables a memory-leak check for certain objects when the app terminates.
+    See the LeakChecked class for more details about enabling leak checking for
+    specific classes.
+*/
+#ifndef   BEAST_CHECK_MEMORY_LEAKS
+//#define BEAST_CHECK_MEMORY_LEAKS 1
 #endif

-#ifndef    BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
- //#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+
+    In a Visual C++  build, this can be used to stop the required system libs
+    being automatically added to the link stage.
+*/
+#ifndef   BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+//#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
 #endif

-#define RIPPLE_USE_NAMESPACE 0
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_INCLUDE_ZLIB_CODE
+
+    This can be used to disable Beast's embedded 3rd-party zlib code.
+    You might need to tweak this if you're linking to an external zlib library in your app,
+    but for normal apps, this option should be left alone.
+
+    If you disable this, you might also want to set a value for BEAST_ZLIB_INCLUDE_PATH, to
+    specify the path where your zlib headers live.
+*/
+#ifndef   BEAST_INCLUDE_ZLIB_CODE
+//#define BEAST_INCLUDE_ZLIB_CODE 0
+#endif
+
+#ifndef BEAST_ZLIB_INCLUDE_PATH
+#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
+#endif
+
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_BOOST_IS_AVAILABLE
+
+    This activates boost specific features and improvements.
+*/
+#ifndef BEAST_BOOST_IS_AVAILABLE
+#define BEAST_BOOST_IS_AVAILABLE 1
+#endif
+
+/** Bind source configuration.
+
+    Set one of these to manually force a particular implementation of bind().
+    If nothing is chosen then beast will use whatever is appropriate for your
+    environment based on what is available.
+*/
+//#define BEAST_BIND_USES_STD   1
+//#define BEAST_BIND_USES_TR1   1
+//#define BEAST_BIND_USES_BOOST 1

 #endif
--- a/Builds/QtCreator/.gitignore
+++ b/Builds/QtCreator/.gitignore
@@ -0,0 +1,5 @@
+# QTCreator
+
+Makefile
+*.user
+
--- a/Builds/QtCreator/rippled.pro
+++ b/Builds/QtCreator/rippled.pro
@@ -0,0 +1,96 @@
+
+# Ripple protocol buffers
+
+PROTOS = ../../src/cpp/ripple/ripple.proto
+PROTOS_DIR = ../../build/proto
+
+# Google Protocol Buffers support
+
+protobuf_h.name = protobuf header
+protobuf_h.input = PROTOS
+protobuf_h.output = $${PROTOS_DIR}/${QMAKE_FILE_BASE}.pb.h
+protobuf_h.depends = ${QMAKE_FILE_NAME}
+protobuf_h.commands = protoc --cpp_out=$${PROTOS_DIR} --proto_path=${QMAKE_FILE_PATH} ${QMAKE_FILE_NAME}
+protobuf_h.variable_out = HEADERS
+QMAKE_EXTRA_COMPILERS += protobuf_h
+
+protobuf_cc.name = protobuf implementation
+protobuf_cc.input = PROTOS
+protobuf_cc.output = $${PROTOS_DIR}/${QMAKE_FILE_BASE}.pb.cc
+protobuf_cc.depends = $${PROTOS_DIR}/${QMAKE_FILE_BASE}.pb.h
+protobuf_cc.commands = $$escape_expand(\\n)
+#protobuf_cc.variable_out = SOURCES
+QMAKE_EXTRA_COMPILERS += protobuf_cc
+
+# Ripple compilation
+
+DESTDIR = ../../build/QtCreator
+OBJECTS_DIR = ../../build/QtCreator/obj
+
+TEMPLATE = app
+CONFIG += console thread warn_off
+CONFIG -= qt gui
+
+linux-gg++:QMAKE_CXXFLAGS += \
+    -Wall \
+    -Wno-sign-compare \
+    -Wno-char-subscripts \
+    -Wno-invalid-offsetof \
+    -Wno-unused-parameter \
+    -Wformat \
+    -O0 \
+    -pthread
+
+INCLUDEPATH += \
+    "../.." \
+    "../../Subtrees" \
+    "../../Subtrees/leveldb/" \
+    "../../Subtrees/leveldb/port" \
+    "../../Subtrees/leveldb/include" \
+    $${PROTOS_DIR}
+
+OTHER_FILES += \
+    $$files(../../Subtrees/beast/*) \
+    $$files(../../Subtrees/beast/modules/beast_basics/diagnostic/*)
+
+#   $$files(../../Subtrees/beast/modules/beast_core/, true)
+#   $$files(../../modules/*, true) \
+#   $$files(../../src/cpp/ripple/*, true) \
+
+UI_HEADERS_DIR += ../../modules/ripple_basics
+
+SOURCES += \
+    ../../Subtrees/beast/modules/beast_basics/beast_basics.cpp \
+    ../../Subtrees/beast/modules/beast_core/beast_core.cpp \
+    ../../modules/ripple_app/ripple_app_pt1.cpp \
+    ../../modules/ripple_app/ripple_app_pt2.cpp \
+    ../../modules/ripple_app/ripple_app_pt3.cpp \
+    ../../modules/ripple_app/ripple_app_pt4.cpp \
+    ../../modules/ripple_app/ripple_app_pt5.cpp \
+    ../../modules/ripple_app/ripple_app_pt6.cpp \
+    ../../modules/ripple_app/ripple_app_pt7.cpp \
+    ../../modules/ripple_app/ripple_app_pt8.cpp \
+    ../../modules/ripple_basics/ripple_basics.cpp \
+    ../../modules/ripple_basio/ripple_basio.cpp \
+    ../../modules/ripple_core/ripple_core.cpp \
+    ../../modules/ripple_client/ripple_client.cpp \
+    ../../modules/ripple_data/ripple_data.cpp \
+    ../../modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
+    ../../modules/ripple_json/ripple_json.cpp \
+    ../../modules/ripple_leveldb/ripple_leveldb.cpp \
+    ../../modules/ripple_mdb/ripple_mdb.c \
+    ../../modules/ripple_net/ripple_net.cpp \
+    ../../modules/ripple_sqlite/ripple_sqlite.c \
+    ../../modules/ripple_websocket/ripple_websocket.cpp
+
+LIBS += \
+    -lboost_date_time-mt\
+    -lboost_filesystem-mt \
+    -lboost_program_options-mt \
+    -lboost_regex-mt \
+    -lboost_system-mt \
+    -lboost_thread-mt \
+    -lboost_random-mt \
+    -lprotobuf \
+    -lssl \
+    -lrt
--- a/Builds/VisualStudio2012/Ripple.sln
+++ b/Builds/VisualStudio2012/Ripple.sln
@@ -1,10 +1,10 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{19465545-42EE-42FA-9CC8-F8975F8F1CC7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "..\..\Subtrees\beast\Builds\VisualStudio2012\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{B7F39ECD-473C-484D-BC34-31F8362506A5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -13,20 +13,22 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.Build.0 = Debug|Win32
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.ActiveCfg = Debug|x64
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.Build.0 = Debug|x64
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|x64.ActiveCfg = Release|x64
-		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.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|Win32
+		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|x64
+		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.Build.0 = Debug|x64
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.ActiveCfg = Release|Win32
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.Build.0 = Release|Win32
-		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.ActiveCfg = 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/Builds/VisualStudio2012/RippleD.props
+++ b/Builds/VisualStudio2012/RippleD.props
@@ -12,10 +12,10 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
      <ExceptionHandling>Async</ExceptionHandling>
    </ClCompile>
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
--- a/LEVELDB.txt
+++ b/LEVELDB.txt
@@ -1,14 +0,0 @@
-
-To use LevelDB, follow these steps:
-
-1) Add the following to your rippled.cfg file:
-[node_db]
-LevelDB
-
-2) If you have no databases, you can just start rippled. If you have
-databases you don't care about, just remove them. Otherwise, start rippled
-with '--import' to import your existing hashnode database into LevelDB.
-After you import the hashnode database, either delete (or move) the
-'hashnode.db', 'hashnode.db-shm' and 'hashnode.db-wal' files from your
-database directory. Do not touch the LevelDB files in the 'hashnode'
-directory.
--- a/5
+++ b/5
@@ -10,7 +10,10 @@ Copyright (c) 2011-2012 Jed McCaleb

 Some code:
 Copyright (c) 2013 Vinnie Falco <vinnie.falco@gmail.com>
-  Contributions from Vinnie Falco provided under the terms of the ISC License:
+Copyright (c) 2013 Bob Way <bob@ripple.com>
+Copyright (c) 2013 Eric Lombrozo <elombrozo@gmail.com>
+  Contributions from Vinnie Falco, Bob Way, and Eric Lombrozo
+  provided under the terms of the ISC License:
  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/RippleD.props
+++ b/RippleD.props
@@ -1,34 +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>$(SolutionDir)build\VisualStudio2012\$(Configuration).$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)build\obj\VisualStudio2012\$(Configuration).$(Platform)\</IntDir>
-    <TargetName>rippled</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <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>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <WarningLevel>Level3</WarningLevel>
-      <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>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ExceptionHandling>Async</ExceptionHandling>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="RepoDir">
-      <Value>$(RepoDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SrcDir">
-      <Value>$(SrcDir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
--- a/61
+++ b/61
@@ -9,17 +9,17 @@ import os
 import platform
 import re

-LevelDB = bool(1)
-
 OSX = bool(platform.mac_ver()[0])
 FreeBSD = bool('FreeBSD' == platform.system())
 Linux   = bool('Linux' == platform.system())
 Ubuntu  = bool(Linux and 'Ubuntu' == platform.linux_distribution()[0])

 if OSX or Ubuntu:
-    CTAGS = '/usr/bin/ctags'
+    CTAGS = 'ctags'
+elif FreeBSD:
+    CTAGS = 'exctags'
 else:
-    CTAGS = '/usr/bin/exuberant-ctags'
+    CTAGS = 'exuberant-ctags'

 #
 # scons tools
@@ -35,6 +35,13 @@ GCC_VERSION = re.split('\.', commands.getoutput(env['CXX'] + ' -dumpversion'))
 #env.Replace(CC = 'clang')
 #env.Replace(CXX = 'clang++')

+# Use a newer gcc on FreeBSD
+if FreeBSD:
+    env.Replace(CC = 'gcc46')
+    env.Replace(CXX = 'g++46')
+    env.Append(CCFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])
+    env.Append(LINKFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])
+
 #
 # Builder for CTags
 #
@@ -47,6 +54,16 @@ else:

 # Use openssl
 env.ParseConfig('pkg-config --cflags --libs openssl')
+# Use protobuf
+env.ParseConfig('pkg-config --cflags --libs protobuf')
+
+# Beast uses kvm on FreeBSD
+if FreeBSD:
+    env.Append (
+        LIBS = [
+            'kvm'
+        ]
+    )

 # The required version of boost is documented in the README file.
 #
@@ -55,6 +72,7 @@ env.ParseConfig('pkg-config --cflags --libs openssl')
 #   If a threading library is included the platform can be whitelisted.
 #
 # FreeBSD and Ubuntu non-mt libs do link with pthreads.
+
 if FreeBSD or Ubuntu:
    env.Append(
        LIBS = [
@@ -103,13 +121,6 @@ INCLUDE_PATHS = [
 COMPILED_FILES = [
    'Subtrees/beast/modules/beast_core/beast_core.cpp',
    'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
-    'modules/ripple_basics/ripple_basics.cpp',
-    'modules/ripple_core/ripple_core.cpp',
-    'modules/ripple_data/ripple_data.cpp',
-    'modules/ripple_json/ripple_json.cpp',
-    'modules/ripple_leveldb/ripple_leveldb.cpp',
-    'modules/ripple_websocket/ripple_websocket.cpp',
-    'modules/ripple_sqlite/ripple_sqlite.c',
    'modules/ripple_app/ripple_app_pt1.cpp',
    'modules/ripple_app/ripple_app_pt2.cpp',
    'modules/ripple_app/ripple_app_pt3.cpp',
@@ -117,7 +128,18 @@ COMPILED_FILES = [
    'modules/ripple_app/ripple_app_pt5.cpp',
    'modules/ripple_app/ripple_app_pt6.cpp',
    'modules/ripple_app/ripple_app_pt7.cpp',
-    'modules/ripple_app/ripple_app_pt8.cpp'
+    'modules/ripple_app/ripple_app_pt8.cpp',
+    'modules/ripple_basics/ripple_basics.cpp',
+    'modules/ripple_basio/ripple_basio.cpp',
+    'modules/ripple_core/ripple_core.cpp',
+    'modules/ripple_data/ripple_data.cpp',
+    'modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp',
+    'modules/ripple_json/ripple_json.cpp',
+    'modules/ripple_leveldb/ripple_leveldb.cpp',
+    'modules/ripple_mdb/ripple_mdb.c',
+    'modules/ripple_net/ripple_net.cpp',
+    'modules/ripple_websocket/ripple_websocket.cpp',
+    'modules/ripple_sqlite/ripple_sqlite.c'
    ]

 #-------------------------------------------------------------------------------
@@ -146,25 +168,18 @@ if not FreeBSD:
        ]
    )

-# Apparently, pkg-config --libs protobuf on bsd fails to provide this necessary include dir.
-if FreeBSD:
-    env.Append(LINKFLAGS = ['-I/usr/local/include'])
-    env.Append(CXXFLAGS = ['-DOS_FREEBSD'])
-
 env.Append(
    LIBS = [
        'rt',           # for clock_nanosleep in beast
-        'protobuf',
        'z'
    ]
 )

 DEBUGFLAGS  = ['-g', '-DDEBUG']
-BOOSTFLAGS  = ['-DBOOST_TEST_DYN_LINK', '-DBOOST_FILESYSTEM_NO_DEPRECATED']

 env.Append(LINKFLAGS = ['-rdynamic', '-pthread'])
 env.Append(CCFLAGS = ['-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts'])
-env.Append(CXXFLAGS = ['-O0', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+BOOSTFLAGS+DEBUGFLAGS)
+env.Append(CXXFLAGS = ['-O0', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+DEBUGFLAGS)

 # RTTI is required for Beast and CountedObject.
 #
@@ -173,6 +188,10 @@ env.Append(CXXFLAGS = ['-frtti'])
 if (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)):
    env.Append(CXXFLAGS = ['-std=c++11'])

+# FreeBSD doesn't support O_DSYNC
+if FreeBSD:
+    env.Append(CPPFLAGS = ['-DMDB_DSYNC=O_SYNC'])
+
 if OSX:
    env.Append(LINKFLAGS = ['-L/usr/local/opt/openssl/lib'])
    env.Append(CXXFLAGS = ['-I/usr/local/opt/openssl/include'])
@@ -186,7 +205,7 @@ TAG_SRCS    = copy.copy(COMPILED_FILES)
 # Derive the object files from the source files.
 OBJECT_FILES = []

-OBJECT_FILES += PROTO_SRCS
+OBJECT_FILES.append(PROTO_SRCS[0])

 for file in COMPILED_FILES:
    OBJECT_FILES.append('build/obj/' + file)
--- a/Subtrees/README.md
+++ b/Subtrees/README.md
@@ -10,9 +10,11 @@ http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ <b

 ## LevelDB

+Ripple's fork of LevelDB is shared by the Bitcoin reference client project.
+
 Repository <br>
 ```
-git@github.com:vinniefalco/LevelDB.git
+git@github.com:ripple/LevelDB.git
 ```
 Branch
 ```
@@ -21,9 +23,11 @@ ripple-fork

 ## websocket

+Ripple's fork of websocketpp has some incompatible changes and Ripple specific includes.
+
 Repository
 ```
-git@github.com:vinniefalco/websocketpp.git
+git@github.com:ripple/websocketpp.git
 ```
 Branch
 ```
@@ -32,9 +36,12 @@ ripple-fork

 ## protobuf

+Ripple's fork of protobuf doesn't have any actual changes, but since the upstream
+repository uses SVN, we have created a Git version to use with the git-subtree command.
+
 Repository
 ```
-git@github.com:vinniefalco/protobuf.git
+git@github.com:ripple/protobuf.git
 ```
 Branch
 ```
--- a/Subtrees/beast/Builds/VisualStudio2012/Beast.props
+++ b/Subtrees/beast/Builds/VisualStudio2012/Beast.props
@@ -0,0 +1,13 @@
+<?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" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PreprocessorDefinitions>_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
--- a/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h
+++ b/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h
@@ -17,35 +17,107 @@
 */
 //==============================================================================

-#ifndef BEAST_BEASTCONFIG_HEADER
-#define BEAST_BEASTCONFIG_HEADER
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+#define BEAST_BEASTCONFIG_H_INCLUDED

-// beast_core flags:
+/** Configuration file for Beast.

-#ifndef    BEAST_FORCE_DEBUG
- //#define BEAST_FORCE_DEBUG
+    This sets various configurable options for Beast. In order to compile you
+    must place a copy of this file in a location where your build environment
+    can find it, and then customize its contents to suit your needs.
+
+    @file BeastConfig.h
+*/
+
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_FORCE_DEBUG
+
+    Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project
+    settings, but if you define this value, you can override this to force it
+    to be true or false.
+*/
+#ifndef   BEAST_FORCE_DEBUG
+//#define BEAST_FORCE_DEBUG 0
 #endif

-#ifndef    BEAST_LOG_ASSERTIONS
- //#define BEAST_LOG_ASSERTIONS 1
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_LOG_ASSERTIONS
+
+    If this flag is enabled, the the bassert and bassertfalse macros will always
+    use Logger::writeToLog() to write a message when an assertion happens.
+
+    Enabling it will also leave this turned on in release builds. When it's
+    disabled, however, the bassert and bassertfalse macros will not be compiled
+    in a release build.
+
+    @see bassert, bassertfalse, Logger
+*/
+#ifndef   BEAST_LOG_ASSERTIONS
+//#define BEAST_LOG_ASSERTIONS 0
 #endif

-#ifndef    BEAST_CHECK_MEMORY_LEAKS
- //#define BEAST_CHECK_MEMORY_LEAKS
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_CHECK_MEMORY_LEAKS
+
+    Enables a memory-leak check for certain objects when the app terminates.
+    See the LeakChecked class for more details about enabling leak checking for
+    specific classes.
+*/
+#ifndef   BEAST_CHECK_MEMORY_LEAKS
+//#define BEAST_CHECK_MEMORY_LEAKS 1
 #endif

-#ifndef    BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
- //#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+//------------------------------------------------------------------------------
+
+/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+
+    In a Visual C++  build, this can be used to stop the required system libs
+    being automatically added to the link stage.
+*/
+#ifndef   BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+//#define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 1
 #endif

-// beast_basics flags
+//------------------------------------------------------------------------------

-#ifndef BEAST_USE_BOOST
-#define BEAST_USE_BOOST 0
+/** Config: BEAST_INCLUDE_ZLIB_CODE
+
+    This can be used to disable Beast's embedded 3rd-party zlib code.
+    You might need to tweak this if you're linking to an external zlib library in your app,
+    but for normal apps, this option should be left alone.
+
+    If you disable this, you might also want to set a value for BEAST_ZLIB_INCLUDE_PATH, to
+    specify the path where your zlib headers live.
+*/
+#ifndef   BEAST_INCLUDE_ZLIB_CODE
+//#define BEAST_INCLUDE_ZLIB_CODE 0
 #endif

-#ifndef BEAST_USE_LEAKCHECKED
-#define BEAST_USE_LEAKCHECKED BEAST_CHECK_MEMORY_LEAKS
+#ifndef BEAST_ZLIB_INCLUDE_PATH
+#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
 #endif

+//------------------------------------------------------------------------------
+
+/** Config: BEAST_BOOST_IS_AVAILABLE
+
+    This activates boost specific features and improvements.
+*/
+#ifndef BEAST_BOOST_IS_AVAILABLE
+#define BEAST_BOOST_IS_AVAILABLE 0
+#endif
+
+/** Bind source configuration.
+
+    Set one of these to manually force a particular implementation of bind().
+    If nothing is chosen then beast will use whatever is appropriate for your
+    environment based on what is available.
+*/
+//#define BEAST_BIND_USES_STD   1
+//#define BEAST_BIND_USES_TR1   1
+//#define BEAST_BIND_USES_BOOST 1
+
 #endif
--- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
+++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
@@ -5,10 +5,18 @@
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\.gitattributes" />
@@ -18,71 +26,60 @@
    <None Include="..\..\modules\beast_core\beast_core.mm" />
    <None Include="..\..\modules\beast_core\native\beast_mac_Files.mm">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\native\beast_mac_Network.mm">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\native\beast_mac_Strings.mm">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\native\beast_mac_SystemStats.mm">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\native\beast_mac_Threads.mm">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\native\java\BeastAppActivity.java">
      <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>
    </None>
    <None Include="..\..\modules\beast_core\zip\zlib\README" />
    <None Include="..\..\README.md" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\modules\beast_basics\beast_basics.h" />
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_List.h" />
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_LockFreeQueue.h" />
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_LockFreeStack.h" />
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_SharedTable.h" />
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_SortedLookupTable.h" />
    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_CatchAny.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Debug.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Error.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_FPUFlags.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_LeakChecked.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_SafeBool.h" />
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Throw.h" />
+    <ClInclude Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.h" />
    <ClInclude Include="..\..\modules\beast_basics\events\beast_OncePerSecond.h" />
-    <ClInclude Include="..\..\modules\beast_basics\events\beast_PerformedAtExit.h" />
-    <ClInclude Include="..\..\modules\beast_basics\functor\beast_Bind.h" />
    <ClInclude Include="..\..\modules\beast_basics\functor\beast_Function.h" />
-    <ClInclude Include="..\..\modules\beast_basics\math\beast_Interval.h" />
    <ClInclude Include="..\..\modules\beast_basics\math\beast_Math.h" />
    <ClInclude Include="..\..\modules\beast_basics\math\beast_MurmurHash.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AllocatedBy.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicCounter.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicFlag.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicPointer.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicState.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_CacheLine.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_FifoFreeStore.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_FifoFreeStoreWithoutTLS.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_FifoFreeStoreWithTLS.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_GlobalFifoFreeStore.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_GlobalPagedFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_MemoryAlignment.h" />
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_RefCountedSingleton.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_StaticObject.h" />
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_Uncopyable.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_CallQueue.h" />
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentObject.h" />
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentState.h" />
+    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedData.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_GlobalThreadGroup.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_InterruptibleThread.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_Listeners.h" />
@@ -91,7 +88,6 @@
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_Semaphore.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SerialFor.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedObject.h" />
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SpinDelay.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h" />
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadWithCallQueue.h" />
    <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
@@ -102,14 +98,25 @@
    <ClInclude Include="..\..\modules\beast_core\containers\beast_ElementComparator.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_HashMap.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_LinkedListPointer.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_List.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeQueue.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeStack.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_NamedValueSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_OwnedArray.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_PropertySet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_ReferenceCountedArray.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_ScopedValueSetter.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h" />
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedLookupTable.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_SparseSet.h" />
    <ClInclude Include="..\..\modules\beast_core\containers\beast_Variant.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h" />
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Throw.h" />
    <ClInclude Include="..\..\modules\beast_core\files\beast_DirectoryIterator.h" />
    <ClInclude Include="..\..\modules\beast_core\files\beast_File.h" />
    <ClInclude Include="..\..\modules\beast_core\files\beast_FileInputStream.h" />
@@ -122,19 +129,27 @@
    <ClInclude Include="..\..\modules\beast_core\logging\beast_Logger.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\beast_BigInteger.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\beast_Expression.h" />
+    <ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\beast_MathsFunctions.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\beast_Random.h" />
    <ClInclude Include="..\..\modules\beast_core\maths\beast_Range.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_Atomic.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicCounter.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicFlag.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicPointer.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicState.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteOrder.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_CacheLine.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_HeapBlock.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_LeakedObjectDetector.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_Memory.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryAlignment.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryBlock.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_OptionalScopedPointer.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_ReferenceCountedObject.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Singleton.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h" />
    <ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h" />
    <ClInclude Include="..\..\modules\beast_core\misc\beast_Result.h" />
    <ClInclude Include="..\..\modules\beast_core\misc\beast_Uuid.h" />
@@ -157,6 +172,7 @@
    <ClInclude Include="..\..\modules\beast_core\streams\beast_MemoryOutputStream.h" />
    <ClInclude Include="..\..\modules\beast_core\streams\beast_OutputStream.h" />
    <ClInclude Include="..\..\modules\beast_core\streams\beast_SubregionStream.h" />
+    <ClInclude Include="..\..\modules\beast_core\system\beast_Functional.h" />
    <ClInclude Include="..\..\modules\beast_core\system\beast_PlatformDefs.h" />
    <ClInclude Include="..\..\modules\beast_core\system\beast_StandardHeader.h" />
    <ClInclude Include="..\..\modules\beast_core\system\beast_SystemStats.h" />
@@ -184,6 +200,7 @@
    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedLock.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedReadLock.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_ScopedWriteLock.h" />
+    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinLock.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_Thread.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_ThreadLocalValue.h" />
@@ -191,6 +208,7 @@
    <ClInclude Include="..\..\modules\beast_core\threads\beast_TimeSliceThread.h" />
    <ClInclude Include="..\..\modules\beast_core\threads\beast_WaitableEvent.h" />
    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformanceCounter.h" />
+    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h" />
    <ClInclude Include="..\..\modules\beast_core\time\beast_RelativeTime.h" />
    <ClInclude Include="..\..\modules\beast_core\time\beast_Time.h" />
    <ClInclude Include="..\..\modules\beast_core\unit_tests\beast_UnitTest.h" />
@@ -216,438 +234,675 @@
    <ClCompile Include="..\..\modules\beast_basics\beast_basics.cpp" />
    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_CatchAny.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_basics\diagnostic\beast_Debug.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_Error.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_FPUFlags.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_LeakChecked.cpp">
+    <ClCompile Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.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_basics\events\beast_OncePerSecond.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>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\events\beast_PerformedAtExit.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\math\beast_MurmurHash.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_basics\memory\beast_FifoFreeStoreWithoutTLS.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_basics\memory\beast_FifoFreeStoreWithTLS.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_basics\memory\beast_GlobalPagedFreeStore.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_basics\memory\beast_PagedFreeStore.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>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_posix_FPUFlags.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_posix_Threads.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_win32_FPUFlags.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_win32_Threads.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\threads\beast_CallQueue.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>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\threads\beast_ConcurrentObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\threads\beast_InterruptibleThread.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_basics\threads\beast_Listeners.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_basics\threads\beast_ParallelFor.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_basics\threads\beast_ReadWriteMutex.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_basics\threads\beast_Semaphore.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_basics\threads\beast_SharedObject.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_basics\threads\beast_ThreadGroup.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_basics\threads\beast_ThreadWithCallQueue.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\beast_core.cpp" />
    <ClCompile Include="..\..\modules\beast_core\containers\beast_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\beast_DynamicObject.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\beast_NamedValueSet.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\beast_PropertySet.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\beast_Variant.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\diagnostic\beast_Debug.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\diagnostic\beast_Error.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\diagnostic\beast_FPUFlags.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\diagnostic\beast_LeakChecked.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\files\beast_DirectoryIterator.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\files\beast_File.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\files\beast_FileInputStream.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\files\beast_FileOutputStream.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\files\beast_FileSearchPath.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\files\beast_TemporaryFile.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\json\beast_JSON.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\logging\beast_FileLogger.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\logging\beast_Logger.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\beast_BigInteger.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\beast_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\beast_Random.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\memory\beast_MemoryBlock.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\misc\beast_Result.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\misc\beast_Uuid.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\native\beast_android_Files.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\native\beast_android_Misc.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\native\beast_android_Network.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\native\beast_android_SystemStats.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\native\beast_android_Threads.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\native\beast_bsd_Files.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\native\beast_bsd_Network.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\native\beast_bsd_SystemStats.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\native\beast_bsd_Threads.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\native\beast_linux_Files.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\native\beast_linux_Network.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\native\beast_linux_SystemStats.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\native\beast_linux_Threads.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\native\beast_posix_FPUFlags.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_NamedPipe.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\native\beast_win32_Files.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\native\beast_win32_FPUFlags.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_Network.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\native\beast_win32_Registry.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\native\beast_win32_SystemStats.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\native\beast_win32_Threads.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\network\beast_IPAddress.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\network\beast_MACAddress.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\network\beast_NamedPipe.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\network\beast_Socket.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\network\beast_URL.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\streams\beast_BufferedInputStream.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\streams\beast_FileInputSource.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\streams\beast_InputStream.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\streams\beast_MemoryInputStream.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\streams\beast_MemoryOutputStream.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\streams\beast_OutputStream.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\streams\beast_SubregionStream.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\system\beast_SystemStats.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\text\beast_CharacterFunctions.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\text\beast_Identifier.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\text\beast_LocalisedStrings.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\text\beast_String.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\text\beast_StringArray.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\text\beast_StringPairArray.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\text\beast_StringPool.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\text\beast_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\beast_ChildProcess.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\beast_HighResolutionTimer.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\beast_ReadWriteLock.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\beast_SpinDelay.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\threads\beast_Thread.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\beast_ThreadPool.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\beast_TimeSliceThread.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\time\beast_PerformanceCounter.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\time\beast_PerformedAtExit.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\time\beast_RelativeTime.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\time\beast_Time.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\unit_tests\beast_UnitTest.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\xml\beast_XmlDocument.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\xml\beast_XmlElement.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\zip\beast_GZIPCompressorOutputStream.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\zip\beast_GZIPDecompressorInputStream.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\zip\beast_ZipFile.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\zip\zlib\adler32.c">
      <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\zip\zlib\compress.c">
      <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\zip\zlib\crc32.c">
      <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\zip\zlib\deflate.c">
      <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\zip\zlib\infback.c">
      <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\zip\zlib\inffast.c">
      <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\zip\zlib\inflate.c">
      <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\zip\zlib\inftrees.c">
      <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\zip\zlib\trees.c">
      <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\zip\zlib\uncompr.c">
      <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\zip\zlib\zutil.c">
      <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>
  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\TODO.txt" />
+  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
@@ -660,6 +915,12 @@
    <PlatformToolset>v110</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@@ -667,14 +928,31 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</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="Beast.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Beast.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" />
+    <Import Project="Beast.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Beast.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
@@ -682,7 +960,19 @@
    <ClCompile>
      <PrecompiledHeader>
      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
@@ -694,7 +984,23 @@
  </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;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
      <PrecompiledHeader>
      </PrecompiledHeader>
      <Optimization>MaxSpeed</Optimization>
--- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -95,9 +95,6 @@
    <Filter Include="beast_basics">
      <UniqueIdentifier>{e3a8f3eb-7f0f-4b81-b978-0dd0823f583b}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast_basics\containers">
-      <UniqueIdentifier>{3e9389c0-c8f0-4657-ab11-cbbea889d3be}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast_basics\diagnostic">
      <UniqueIdentifier>{ba11b980-76dd-49a4-b2c7-878e9f08f8ce}</UniqueIdentifier>
    </Filter>
@@ -113,12 +110,12 @@
    <Filter Include="beast_basics\memory">
      <UniqueIdentifier>{9e850052-6ab7-4a65-911d-adfde81ceb5f}</UniqueIdentifier>
    </Filter>
-    <Filter Include="beast_basics\native">
-      <UniqueIdentifier>{811c5374-8959-4df9-aba9-a7e27b85046e}</UniqueIdentifier>
-    </Filter>
    <Filter Include="beast_basics\threads">
      <UniqueIdentifier>{f58dddf7-fe43-49a2-8e57-91feba586119}</UniqueIdentifier>
    </Filter>
+    <Filter Include="beast_core\diagnostic">
+      <UniqueIdentifier>{69e28551-92ea-420b-a465-75ed248e3b59}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\modules\beast_core\beast_core.h">
@@ -223,9 +220,6 @@
    <ClInclude Include="..\..\modules\beast_core\memory\beast_HeapBlock.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_LeakedObjectDetector.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\memory\beast_Memory.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
@@ -241,9 +235,6 @@
    <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\memory\beast_Singleton.h">
-      <Filter>beast_core\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_core\memory\beast_WeakReference.h">
      <Filter>beast_core\memory</Filter>
    </ClInclude>
@@ -473,57 +464,15 @@
    <ClInclude Include="..\..\modules\beast_basics\beast_basics.h">
      <Filter>beast_basics</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_List.h">
-      <Filter>beast_basics\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_LockFreeQueue.h">
-      <Filter>beast_basics\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_LockFreeStack.h">
-      <Filter>beast_basics\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_SharedTable.h">
-      <Filter>beast_basics\containers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\containers\beast_SortedLookupTable.h">
-      <Filter>beast_basics\containers</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_CatchAny.h">
      <Filter>beast_basics\diagnostic</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Debug.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Error.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_FPUFlags.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_LeakChecked.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_SafeBool.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\diagnostic\beast_Throw.h">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\events\beast_OncePerSecond.h">
      <Filter>beast_basics\events</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\events\beast_PerformedAtExit.h">
-      <Filter>beast_basics\events</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\functor\beast_Bind.h">
-      <Filter>beast_basics\functor</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\functor\beast_Function.h">
      <Filter>beast_basics\functor</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\math\beast_Interval.h">
-      <Filter>beast_basics\math</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\math\beast_Math.h">
      <Filter>beast_basics\math</Filter>
    </ClInclude>
@@ -533,21 +482,6 @@
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AllocatedBy.h">
      <Filter>beast_basics\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicCounter.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicFlag.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicPointer.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_AtomicState.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_CacheLine.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_FifoFreeStore.h">
      <Filter>beast_basics\memory</Filter>
    </ClInclude>
@@ -563,30 +497,12 @@
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_GlobalPagedFreeStore.h">
      <Filter>beast_basics\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_MemoryAlignment.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.h">
      <Filter>beast_basics\memory</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_RefCountedSingleton.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_StaticObject.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\memory\beast_Uncopyable.h">
-      <Filter>beast_basics\memory</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_CallQueue.h">
      <Filter>beast_basics\threads</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentObject.h">
-      <Filter>beast_basics\threads</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ConcurrentState.h">
-      <Filter>beast_basics\threads</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_GlobalThreadGroup.h">
      <Filter>beast_basics\threads</Filter>
    </ClInclude>
@@ -611,15 +527,90 @@
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedObject.h">
      <Filter>beast_basics\threads</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SpinDelay.h">
-      <Filter>beast_basics\threads</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadGroup.h">
      <Filter>beast_basics\threads</Filter>
    </ClInclude>
    <ClInclude Include="..\..\modules\beast_basics\threads\beast_ThreadWithCallQueue.h">
      <Filter>beast_basics\threads</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_List.h">
+      <Filter>beast_core\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_CacheLine.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_MemoryAlignment.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicCounter.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicFlag.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicPointer.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_AtomicState.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeQueue.h">
+      <Filter>beast_core\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_LockFreeStack.h">
+      <Filter>beast_core\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\threads\beast_SpinDelay.h">
+      <Filter>beast_core\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_StaticObject.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_SharedTable.h">
+      <Filter>beast_core\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\containers\beast_SortedLookupTable.h">
+      <Filter>beast_core\containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Debug.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Error.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SafeBool.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_Throw.h">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_Uncopyable.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\beast_SharedSingleton.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\system\beast_Functional.h">
+      <Filter>beast_core\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\maths\beast_Interval.h">
+      <Filter>beast_core\maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\time\beast_PerformedAtExit.h">
+      <Filter>beast_core\time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_basics\threads\beast_SharedData.h">
+      <Filter>beast_basics\threads</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.h">
+      <Filter>beast_basics\events</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
@@ -877,24 +868,9 @@
    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_CatchAny.cpp">
      <Filter>beast_basics\diagnostic</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_Debug.cpp">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_Error.cpp">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_FPUFlags.cpp">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\diagnostic\beast_LeakChecked.cpp">
-      <Filter>beast_basics\diagnostic</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\events\beast_OncePerSecond.cpp">
      <Filter>beast_basics\events</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\events\beast_PerformedAtExit.cpp">
-      <Filter>beast_basics\events</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\math\beast_MurmurHash.cpp">
      <Filter>beast_basics\math</Filter>
    </ClCompile>
@@ -910,24 +886,9 @@
    <ClCompile Include="..\..\modules\beast_basics\memory\beast_PagedFreeStore.cpp">
      <Filter>beast_basics\memory</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_posix_FPUFlags.cpp">
-      <Filter>beast_basics\native</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_posix_Threads.cpp">
-      <Filter>beast_basics\native</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_win32_FPUFlags.cpp">
-      <Filter>beast_basics\native</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\native\beast_win32_Threads.cpp">
-      <Filter>beast_basics\native</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\threads\beast_CallQueue.cpp">
      <Filter>beast_basics\threads</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_basics\threads\beast_ConcurrentObject.cpp">
-      <Filter>beast_basics\threads</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\beast_basics\threads\beast_InterruptibleThread.cpp">
      <Filter>beast_basics\threads</Filter>
    </ClCompile>
@@ -952,5 +913,47 @@
    <ClCompile Include="..\..\modules\beast_basics\threads\beast_ThreadWithCallQueue.cpp">
      <Filter>beast_basics\threads</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_SystemStats.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Files.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Network.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_bsd_Threads.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Debug.cpp">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_Error.cpp">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_FPUFlags.cpp">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_LeakChecked.cpp">
+      <Filter>beast_core\diagnostic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\threads\beast_SpinDelay.cpp">
+      <Filter>beast_core\threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_posix_FPUFlags.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\native\beast_win32_FPUFlags.cpp">
+      <Filter>beast_core\native</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\time\beast_PerformedAtExit.cpp">
+      <Filter>beast_core\time</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.cpp">
+      <Filter>beast_basics\events</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="..\..\TODO.txt" />
  </ItemGroup>
 </Project>
--- a/Subtrees/beast/ReadMe.md
+++ b/Subtrees/beast/ReadMe.md
@@ -9,6 +9,23 @@ The hope is that this will replace the use of boost and other cumbersome jalopie

 ## JUCE

-Beast is based on the beast_core module which is provided under the ISC
+Parts of Beast are based on the juce_core module which is provided under the ISC
 license. More information about JUCE is available at
+
 http://www.juce.com
+
+## License
+
+Beast is provided under the terms of the ISC license:
+
+        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.
--- a/Subtrees/beast/TODO.txt
+++ b/Subtrees/beast/TODO.txt
@@ -0,0 +1,60 @@
+--------------------------------------------------------------------------------
+BEAST TODO
+--------------------------------------------------------------------------------
+
+- Design a WeakPtr / SharedPtr / SharedObject intrusive system
+
+- Implement beast::Bimap?
+
+- Use Bimap for storage in the DeadlineTimer::Manager, to support
+  thousands of timers.
+
+- Think about adding a shouldStop bool to InterruptibleThread, along
+  with a shouldStop () function returning bool, and a stop() method.
+
+- Make OwnedArray add routines return a pointer instead of reference
+
+- Tidy up CacheLine, MemoryAlignment
+
+- Remove anything having to do with DLL builds like
+  BEAST_DLL, BEAST_DLL_BUILD, BEAST_DISABLE_DLL_ALLOCATORS
+
+- Fix FifoFreeStoreWithTLS reference counting bug
+
+- Implement a reasonable substitute for boost's thread_local_storage
+
+- Think about doing away with BEAST_CALLTYPE and BEAST_API
+
+- Decide if headers should just include BeastConfig.h instead of making the
+  host program do it.
+
+- Rename malloc/calloc JUCE members that conflict with the debug CRT from MSVC
+
+- Make beast::HashMap support assignment via operator[]
+
+- Reformat every Doxygen comment
+- Fix Doxygen metatags
+- update Beast Doxyfile
+
+- 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
+
+- Rename SharedData to SharedState or something?
+
+- Figure out what to do with ReadWriteLock, and NamedPipe which uses it?
+
+- Put BEAST_PUBLIC_FUNCTION in front of all loose functions
+
+- restructure the repo sources to look like this:
+  /Source/beast/beast_core/beast_core.h
+  etc...
+- Put the BeastConfig.h at the root of the repo.
+- Make sure the template BeastConfig.h is included in the Doxyfile
+
+- Implement robust key/value database with bulk write
+
--- a/Subtrees/beast/modules/beast_basics/beast_basics.cpp
+++ b/Subtrees/beast/modules/beast_basics/beast_basics.cpp
@@ -41,39 +41,19 @@ namespace beast
 {

 #include "diagnostic/beast_CatchAny.cpp"
-#include "diagnostic/beast_Debug.cpp"
-#include "diagnostic/beast_Error.cpp"
-#include "diagnostic/beast_FPUFlags.cpp"
-#include "diagnostic/beast_LeakChecked.cpp"

+#include "events/beast_DeadlineTimer.cpp"
 #include "events/beast_OncePerSecond.cpp"
-#include "events/beast_PerformedAtExit.cpp"

 #include "math/beast_MurmurHash.cpp"

 #include "threads/beast_InterruptibleThread.cpp"
 #include "threads/beast_Semaphore.cpp"
-
-#if BEAST_WINDOWS
-#include "native/beast_win32_FPUFlags.cpp"
-#include "native/beast_win32_Threads.cpp"
-
-#else
-#include "native/beast_posix_FPUFlags.cpp"
-#include "native/beast_posix_Threads.cpp"
-
-#endif
-
-#if BEAST_USE_BOOST
 #include "memory/beast_FifoFreeStoreWithTLS.cpp"
-#else
 #include "memory/beast_FifoFreeStoreWithoutTLS.cpp"
-#endif
 #include "memory/beast_GlobalPagedFreeStore.cpp"
 #include "memory/beast_PagedFreeStore.cpp"
-
 #include "threads/beast_CallQueue.cpp"
-#include "threads/beast_ConcurrentObject.cpp"
 #include "threads/beast_Listeners.cpp"
 #include "threads/beast_ManualCallQueue.cpp"
 #include "threads/beast_ParallelFor.cpp"
--- a/Subtrees/beast/modules/beast_basics/beast_basics.h
+++ b/Subtrees/beast/modules/beast_basics/beast_basics.h
@@ -23,362 +23,219 @@
    @ingroup beast_basics
 */

-#ifndef BEAST_BASICS_BEASTHEADER
-#define BEAST_BASICS_BEASTHEADER
+#ifndef BEAST_BASICS_H_INCLUDED
+#define BEAST_BASICS_H_INCLUDED

-//==============================================================================
+//------------------------------------------------------------------------------
+
+/*  If you fail to make sure that all your compile units are building Beast with
+    the same set of option flags, then there's a risk that different compile
+    units will treat the classes as having different memory layouts, leading to
+    very nasty memory corruption errors when they all get linked together.
+    That's why it's best to always include the BeastConfig.h file before any
+    beast headers.
+*/
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+# ifdef _MSC_VER
+#  pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
+# else
+#  warning "Have you included your BeastConfig.h file before including the Beast headers?"
+# endif
+#endif
+
+//------------------------------------------------------------------------------
 /**
-  @mainpage Beast: A multipurpose library using parts of JUCE.

-  ### Version 1.1
+@mainpage Beast: A C++ library for server development.

-  Copyright (C) 2008 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])
+### Version 1.0

-  Beast is a source code collection of individual modules containing
-  functionality for a variety of applications, with an emphasis on building
-  concurrent systems. Beast requires [JUCE][3] (Jules' Utility Class
-  Extensions), available from [Raw Material Software][4]. JUCE is available
-  under both the [GNU General Public License][5] and a [commercial license][6].
-  Other than JUCE, Beast has no external dependencies.
+Copyright 2008, 2013 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])

-  Beast is hosted on Github at [https://github.com/vinniefalco/Beast][1]
+Beast is a source code collection of individual modules containing
+functionality for a variety of applications, with an emphasis on building
+concurrent systems. Beast incorporates parts of [JUCE][3] (Jules' Utility
+Class Extensions), available from [Raw Material Software][4]. Beast has no
+external dependencies 

-  The online documentation is at [http://vinniefalco.github.com/Beast][2]
+Beast is hosted on Github at [https://github.com/vinniefalco/Beast][1]

-  ## Platforms
+The online documentation is at [http://vinniefalco.github.com/Beast][2]

-  All platforms supported by JUCE are also supported by Beast. Currently these
-  platforms include:
+## Platforms

-  - **Windows**: Applications and VST/RTAS/NPAPI/ActiveX plugins can be built
-    using MS Visual Studio. The results are all fully compatible with Windows
-    XP, Vista or Windows 7.
+All platforms supported by JUCE are also supported by Beast. Currently these
+platforms include:

-  - **Mac OS X**: Applications and VST/AudioUnit/RTAS/NPAPI plugins with Xcode.
+- **Windows**: Applications and VST/RTAS/NPAPI/ActiveX plugins can be built
+using MS Visual Studio. The results are all fully compatible with Windows
+XP, Vista or Windows 7.

-  - **GNU/Linux**: Applications and plugins can be built for any kernel 2.6 or
-    later.
+- **Mac OS X**: Applications and VST/AudioUnit/RTAS/NPAPI plugins with Xcode.

-  - **iOS**: Native iPhone and iPad apps.
+- **GNU/Linux**: Applications and plugins can be built for any kernel 2.6 or
+later.

-  - **Android**: Supported.
+- **FreeBSD**: Kernel version 8.4 or higher required.

-  ## Prerequisites
+- **iOS**: Native iPhone and iPad apps.

-  This documentation assumes that the reader has a working knowledge of JUCE.
-  Some modules built on external libraries assume that the reader understands
-  the operation of those external libraries. Certain modules assume that the
-  reader understands additional domain-specific information. Modules with
-  additional prerequisites are marked in the documentation.
+- **Android**: Supported.

-  ## External Modules
+## Prerequisites

-  Some modules bring in functionality provided by external libraries. For
-  example, the @ref beast_bzip2 module provides the compression and decompression
-  algorithms in [bZip2][7]. Usage of these external library modules is optional.
-  They come with complete source code, as well as options for using either
-  system or user provided variants of the external libraries: it is not
-  necessary to download additional source code packages to use these modules.
+This documentation assumes that the reader has a working knowledge of JUCE.
+Some modules built on external libraries assume that the reader understands
+the operation of those external libraries. Certain modules assume that the
+reader understands additional domain-specific information. Modules with
+additional prerequisites are marked in the documentation.

-  External code incorporated into Beast is covered by separate licenses. See
-  the licensing information and notes in the corresponding source files for
-  copyright information and terms of use.
+## External Modules

-  ## Integration
+Some modules bring in functionality provided by external libraries. For
+example, the @ref beast_bzip2 module provides the compression and decompression
+algorithms in [bZip2][7]. Usage of these external library modules is optional.
+They come with complete source code, as well as options for using either
+system or user provided variants of the external libraries: it is not
+necessary to download additional source code packages to use these modules.

-  Beast requires recent versions of JUCE. It won't work with versions 1.53 or
-  earlier. To use the library it is necessary to first download JUCE to a
-  location where your development environment can find it. Or, you can use your
-  existing installation of JUCE.
+External code incorporated into Beast is covered by separate licenses. See
+the licensing information and notes in the corresponding source files for
+copyright information and terms of use.

-  This library uses the same modularized organizational structure as JUCE. To
-  use a module, first add a path to the list of includes searched by your
-  development environment or project, which points to the Beast directory. Then,
-  add the single corresponding .c or .cpp file to your existing project which
-  already uses JUCE. For example, to use the @ref beast_core module, add the file
-  beast_core.cpp to your project. Some modules depend on other modules.
+## Integration

-  To use a module, include the appropriate header from within your source code.
-  For example, to access classes in the @ref beast_concurrent module, use this:
+Beast requires recent versions of JUCE. It won't work with versions 1.53 or
+earlier. To use the library it is necessary to first download JUCE to a
+location where your development environment can find it. Or, you can use your
+existing installation of JUCE.

-  @code
+This library uses the same modularized organizational structure as JUCE. To
+use a module, first add a path to the list of includes searched by your
+development environment or project, which points to the Beast directory. Then,
+add the single corresponding .c or .cpp file to your existing project which
+already uses JUCE. For example, to use the @ref beast_core module, add the file
+beast_core.cpp to your project. Some modules depend on other modules.

-  #include "modules/beast_concurrent/beast_concurrent.h"
+To use a module, include the appropriate header from within your source code.
+For example, to access classes in the @ref beast_concurrent module, use this:

-  @endcode
+@code

-  Then add the corresponding file beast_concurrent.cpp to your build.
+#include "modules/beast_concurrent/beast_concurrent.h"

-  ## AppConfig
+@endcode

-  Some Beast features can be controlled at compilation time through
-  preprocessor directives. The available choices of compilation options are
-  described in AppConfig.h, located in the AppConfigTemplate directory. Copy
-  the provided settings into your existing AppConfig.h (a file used by JUCE
-  convention).
+Then add the corresponding file beast_concurrent.cpp to your build.

-  ## License
+## AppConfig

-  This library contains portions of other open source products covered by
-  separate licenses. Please see the corresponding source files for specific
-  terms.
+Some Beast features can be controlled at compilation time through
+preprocessor directives. The available choices of compilation options are
+described in AppConfig.h, located in the AppConfigTemplate directory. Copy
+the provided settings into your existing AppConfig.h (a file used by JUCE
+convention).

-  Beast is provided under the terms of The MIT License (MIT):
+## License

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
+This library contains portions of other open source products covered by
+separate licenses. Please see the corresponding source files for specific
+terms.

-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
+Beast is provided under the terms of The ISC License:

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 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.
+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.

-  Some files contain portions of these external projects, licensed separately:
+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.

-  - [bZip2][7] is Copyright (C) 1996-2010 Julian R Seward. All rights
+Some files contain portions of these external projects, licensed separately:
+
+- [bZip2][7] is Copyright (C) 1996-2010 Julian R Seward. All rights
    reserved. See the corresponding file LICENSE for licensing terms.

-  - Portions of the software are Copyright (C) 1996-2001, 2006 by [The FreeType
-    Project][8]. All rights reserved. [FreeType][8] is distributed
-    under both the [GNU General Public License][5], or the
-    [FreeType License][9].
-
-  - Portions of this software are Copyright (C) 1994-2012 [Lua.org][10], PUC-Rio.
-    Lua is distributed under the terms of the [MIT License][11].
-
-  - [Luabridge][12] is Copyright (C) 2012 by Vinnie Falco and Copyrighted (C)
-    2007 by Nathan Reed. [Luabridge][12] is distributed under the terms of the
-    [MIT License][11].
-
-  - [Soci][13] is Copyright (C) 2004-2008 Maciej Sobczak, Stephen Hutton, and
+- [Soci][13] is Copyright (C) 2004-2008 Maciej Sobczak, Stephen Hutton, and
    various others noted in the corresponding source files. Soci is distributed
    under the [Boost Software License, Version 1.0][14].

-  - [SQLite][15], placed in the public domain.
+- [SQLite][15], placed in the public domain.

-  - [TagLib][16] is distributed under both the [GNU Lesser General Public License,
-  Version 2.1][17] and the [Mozilla Public License][18].
+[0]: mailto:vinnie.falco@gmail.com "Vinnie Falco (Email)"
+[1]: https://github.com/vinniefalco/Beast "Beast Project"
+[2]: http://vinniefalco.github.com/Beast/ "Beast Documentation"
+[3]: http://rawmaterialsoftware.com/juce.php "JUCE"
+[4]: http://rawmaterialsoftware.com/ "Raw Material Software"
+[5]: http://www.gnu.org/licenses/gpl-2.0.html "GNU General Public License, version 2"
+[6]: http://rawmaterialsoftware.com/jucelicense.php "JUCE Licenses"
+[7]: http://www.bzip.org/ "bZip2: Home"
+[8]: http://freetype.org/ "The FreeType Project"
+[9]: http://www.freetype.org/FTL.TXT "The FreeType Project License"
+[10]: http://www.lua.org/ "The Programming Language Lua"
+[11]: http://opensource.org/licenses/ISC "The ISC License"
+[12]: https://github.com/vinniefalco/LuaBridge
+[13]: http://soci.sourceforge.net/ "SOCI"
+[14]: http://www.boost.org/LICENSE_1_0.txt "Boost Software License, Version 1.0"
+[15]: http://sqlite.org/ "SQLite Home Page"
+[16]: http://developer.kde.org/~wheeler/taglib.html "TagLib"
+[17]: http://www.gnu.org/licenses/lgpl-2.1.html "Gnu Lesser General Public License, version 2.1"
+[18]: http://www.mozilla.org/MPL/1.1/ "Mozilla Public License"

-  [0]: mailto:vinnie.falco@gmail.com "Vinnie Falco (Email)"
-  [1]: https://github.com/vinniefalco/Beast "Beast Project"
-  [2]: http://vinniefalco.github.com/Beast/ "Beast Documentation"
-  [3]: http://rawmaterialsoftware.com/juce.php "JUCE"
-  [4]: http://rawmaterialsoftware.com/ "Raw Material Software"
-  [5]: http://www.gnu.org/licenses/gpl-2.0.html "GNU General Public License, version 2"
-  [6]: http://rawmaterialsoftware.com/jucelicense.php "JUCE Licenses"
-  [7]: http://www.bzip.org/ "bZip2: Home"
-  [8]: http://freetype.org/ "The FreeType Project"
-  [9]: http://www.freetype.org/FTL.TXT "The FreeType Project License"
-  [10]: http://www.lua.org/ "The Programming Language Lua"
-  [11]: http://www.opensource.org/licenses/mit-license.html "The MIT License"
-  [12]: https://github.com/vinniefalco/LuaBridge
-  [13]: http://soci.sourceforge.net/ "SOCI"
-  [14]: http://www.boost.org/LICENSE_1_0.txt "Boost Software License, Version 1.0"
-  [15]: http://sqlite.org/ "SQLite Home Page"
-  [16]: http://developer.kde.org/~wheeler/taglib.html "TagLib"
-  [17]: http://www.gnu.org/licenses/lgpl-2.1.html "Gnu Lesser General Public License, version 2.1"
-  [18]: http://www.mozilla.org/MPL/1.1/ "Mozilla Public License"
-
-  @copyright Copyright (C) 2008 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])
-  @copyright Provided under the [MIT License][11]
+@copyright Copyright 2008-2013 by Vinnie Falco \<vinnie.falco@gmail.com\> ([e-mail][0])
+@copyright Provided under the [ISC LIcense][11]
 */

-/*============================================================================*/
-/**
-  @internal
+//------------------------------------------------------------------------------

-  Implementation classes.
+/** Implementation classes.

-  Thase classes are used internally.
+    Thase classes are used internally.

-  @defgroup internal internal
+    @defgroup internal internal
+    @internal
 */

-/*============================================================================*/
-/**
-  External modules.
+//------------------------------------------------------------------------------

-  These modules bring in functionality from third party or system libraries.
+/** External modules.

-  @defgroup external external
+    These modules bring in functionality from third party or system libraries.
+
+    @defgroup external external
 */

-/*============================================================================*/
-/**
-  Core classes.
+//------------------------------------------------------------------------------

-  This module provides core required functionality, and classes useful for
-  general development. All other modules require this module.
+/** Core classes.

-  @todo Discuss the treatment of exceptions versus Error objects in the library.
+    This module provides core required functionality, and classes useful for
+    general development. All other modules require this module.

-  @todo Discuss the additions to AppConfig.h
+    @todo Discuss the treatment of exceptions versus Error objects in the
+          library.

-  @defgroup beast_core beast_core
+    @todo Discuss the additions to BeastConfig.h
+
+    @defgroup beast_core beast_core
 */

-/*  See the Juce notes regarding AppConfig.h
-
-    This file must always be included before any Juce headers.
-
-    There are some Beast specific build options that may be placed
-    into this file. See the AppConfig.h provided with Beast.
-*/
-
-/* BeastConfig.h must be included before this file */
-
-/* Use sensible default configurations if they forgot
-   to append the necessary macros into their AppConfig.h.
-*/
-#ifndef BEAST_USE_BOOST
-#define BEAST_USE_BOOST      0
-#endif
-
-#ifndef BEAST_USE_LEAKCHECKED
-#define BEAST_USE_LEAKCHECKED BEAST_CHECK_MEMORY_LEAKS
-#endif
-
 /* Get this early so we can use it. */
 #include "../beast_core/system/beast_TargetPlatform.h"

-#if BEAST_USE_BOOST
+//------------------------------------------------------------------------------
+
+#if BEAST_BOOST_IS_AVAILABLE
 #include <boost/thread/tss.hpp>
 #endif

-#if BEAST_MSVC
-# include <crtdbg.h>
-# include <functional>
-
-#elif BEAST_IOS
-# if BEAST_USE_BOOST
-#  include <boost/bind.hpp>
-#  include <boost/function.hpp>
-# else
-#  include <ciso646>  // detect std::lib
-#  if _LIBCPP_VERSION // libc++
-#   include <functional>
-#  else // libstdc++ (GNU)
-#   include <tr1/functional>
-#  endif
-# endif
-
-#elif BEAST_MAC
-# include <ciso646>  // detect std::lib
-# if _LIBCPP_VERSION // libc++
-#  include <functional>
-# else // libstdc++ (GNU)
-#  include <tr1/functional>
-# endif
-
-#elif BEAST_LINUX
-# include <tr1/functional>
-
-#else
-# error Unnkown platform!
-
-#endif
-
-#include <algorithm>
-#include <cfloat>
-#include <cmath>
-#include <cstdarg>
-#include <cstddef>
-#include <exception>
-#include <istream>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <map>
-#include <new>
-#include <numeric>
-#include <ostream>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <typeinfo>
-#include <vector>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <locale.h>
-#include <math.h>
-#include <memory.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _CRTDBG_MAP_ALLOC
-#error "MSVC C Runtime Debug Macros not supported"
-#endif
-
-// If the MSVC debug heap headers were included, disable
-// the macros during the juce include since they conflict.
-#ifdef _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#include <stdlib.h>
-#include <malloc.h>
-
-#pragma push_macro("calloc")
-#pragma push_macro("free")
-#pragma push_macro("malloc")
-#pragma push_macro("realloc")
-#pragma push_macro("_recalloc")
-#pragma push_macro("_aligned_free")
-#pragma push_macro("_aligned_malloc")
-#pragma push_macro("_aligned_offset_malloc")
-#pragma push_macro("_aligned_realloc")
-#pragma push_macro("_aligned_recalloc")
-#pragma push_macro("_aligned_offset_realloc")
-#pragma push_macro("_aligned_offset_recalloc")
-#pragma push_macro("_aligned_msize")
-
-#undef calloc
-#undef free
-#undef malloc
-#undef realloc
-#undef _recalloc
-#undef _aligned_free
-#undef _aligned_malloc
-#undef _aligned_offset_malloc
-#undef _aligned_realloc
-#undef _aligned_recalloc
-#undef _aligned_offset_realloc
-#undef _aligned_offset_recalloc
-#undef _aligned_msize
-#endif
-
 #include "../beast_core/beast_core.h"

-#ifdef _CRTDBG_MAP_ALLOC
-#pragma pop_macro("_aligned_msize")
-#pragma pop_macro("_aligned_offset_recalloc")
-#pragma pop_macro("_aligned_offset_realloc")
-#pragma pop_macro("_aligned_recalloc")
-#pragma pop_macro("_aligned_realloc")
-#pragma pop_macro("_aligned_offset_malloc")
-#pragma pop_macro("_aligned_malloc")
-#pragma pop_macro("_aligned_free")
-#pragma pop_macro("_recalloc")
-#pragma pop_macro("realloc")
-#pragma pop_macro("malloc")
-#pragma pop_macro("free")
-#pragma pop_macro("calloc")
-#endif
-
 /** The Beast namespace.

    This namespace contains all Beast symbols.
@@ -386,69 +243,28 @@
 namespace beast
 {

-// This group must come first since other files need it
-#include "memory/beast_Uncopyable.h"
-#include "diagnostic/beast_CatchAny.h"
-#include "diagnostic/beast_Debug.h"
-#include "diagnostic/beast_Error.h"
-#include "diagnostic/beast_FPUFlags.h"
-#include "diagnostic/beast_LeakChecked.h"
-#include "diagnostic/beast_SafeBool.h"
-#include "diagnostic/beast_Throw.h"
+// Order matters

-#include "containers/beast_List.h"
-#include "containers/beast_LockFreeStack.h"
-#include "containers/beast_LockFreeQueue.h"
-#include "containers/beast_SharedTable.h"
-#include "containers/beast_SortedLookupTable.h"
-
-#include "events/beast_OncePerSecond.h"
-#include "events/beast_PerformedAtExit.h"
-
-#include "functor/beast_Bind.h"
 #include "functor/beast_Function.h"
-
-#include "math/beast_Interval.h"
+#include "diagnostic/beast_CatchAny.h"
+#include "events/beast_DeadlineTimer.h"
+#include "events/beast_OncePerSecond.h"
 #include "math/beast_Math.h"
 #include "math/beast_MurmurHash.h"
-
-#include "memory/beast_MemoryAlignment.h"
-#include "memory/beast_StaticObject.h"
-#include "memory/beast_AtomicCounter.h"
-#include "memory/beast_AtomicFlag.h"
-#include "memory/beast_AtomicPointer.h"
-#include "memory/beast_AtomicState.h"
 #include "memory/beast_AllocatedBy.h"
-#include "memory/beast_RefCountedSingleton.h"
-#include "memory/beast_FifoFreeStore.h"
-#if BEAST_USE_BOOST
-#include "memory/beast_FifoFreeStoreWithTLS.h"
-#else
-#include "memory/beast_FifoFreeStoreWithoutTLS.h"
-#endif
-#include "memory/beast_GlobalFifoFreeStore.h"
-#include "memory/beast_GlobalPagedFreeStore.h"
 #include "memory/beast_PagedFreeStore.h"
-
-#if BEAST_MSVC
-#pragma warning (push)
-#pragma warning (disable: 4100) // unreferenced formal parmaeter
-#pragma warning (disable: 4355) // 'this' used in base member
-#endif
-#include "memory/beast_CacheLine.h"
-#if BEAST_MSVC
-#pragma warning (pop)
-#endif
-
+#include "memory/beast_GlobalPagedFreeStore.h"
+#include "memory/beast_FifoFreeStoreWithTLS.h"
+#include "memory/beast_FifoFreeStoreWithoutTLS.h"
+#include "memory/beast_FifoFreeStore.h"
+#include "memory/beast_GlobalFifoFreeStore.h"
 #include "threads/beast_Semaphore.h"
 #include "threads/beast_SerialFor.h"
-#include "threads/beast_SpinDelay.h"
 #include "threads/beast_InterruptibleThread.h"
 #include "threads/beast_ReadWriteMutex.h"
 #include "threads/beast_ThreadGroup.h"
 #include "threads/beast_CallQueue.h"
-#include "threads/beast_ConcurrentObject.h"
-#include "threads/beast_ConcurrentState.h"
+#include "threads/beast_SharedData.h"
 #include "threads/beast_GlobalThreadGroup.h"
 #include "threads/beast_Listeners.h"
 #include "threads/beast_ManualCallQueue.h"
--- a/Subtrees/beast/modules/beast_basics/native/beast_posix_Threads.cpp
+++ b/Subtrees/beast/modules/beast_basics/native/beast_posix_Threads.cpp
@@ -16,3 +16,5 @@
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
+
+#include "beast_basics.cpp"
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_CatchAny.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_CatchAny.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_CATCHANY_BEASTHEADER
 #define BEAST_CATCHANY_BEASTHEADER

-#include "../functor/beast_Function.h"
-
 /**
  Exception catcher.

--- a/Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.cpp
+++ b/Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.cpp
@@ -0,0 +1,259 @@
+//------------------------------------------------------------------------------
+/*
+    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.
+*/
+//==============================================================================
+
+class DeadlineTimer::Manager
+    : public SharedSingleton <DeadlineTimer::Manager>
+    , public InterruptibleThread::EntryPoint
+{
+private:
+    typedef CriticalSection LockType;
+    typedef List <DeadlineTimer> Items;
+
+public:
+    Manager ()
+        : SharedSingleton <Manager> (SingletonLifetime::persistAfterCreation)
+        , m_shouldStop (false)
+        , m_thread ("DeadlineTimer::Manager")
+    {
+        m_thread.start (this);
+    }
+
+    ~Manager ()
+    {
+        m_shouldStop = true;
+
+        m_thread.interrupt ();
+
+        bassert (m_items.empty ());
+    }
+
+    // Okay to call on an active timer.
+    // However, an extra notification may still happen due to concurrency.
+    //
+    void activate (DeadlineTimer* timer, double secondsRecurring, Time const& when)
+    {
+        bassert (secondsRecurring >= 0);
+
+        LockType::ScopedLockType lock (m_mutex);
+
+        if (timer->m_isActive)
+        {
+            m_items.erase (m_items.iterator_to (*timer));
+
+            timer->m_isActive = false;
+        }
+
+        timer->m_secondsRecurring = secondsRecurring;
+        timer->m_notificationTime = when;
+
+        insertSorted (*timer);
+        timer->m_isActive = true;
+
+        m_thread.interrupt ();
+    }
+
+    // Okay to call this on an inactive timer.
+    // This can happen naturally based on concurrency.
+    //
+    void deactivate (DeadlineTimer* timer)
+    {
+        LockType::ScopedLockType lock (m_mutex);
+
+        if (timer->m_isActive)
+        {
+            m_items.erase (m_items.iterator_to (*timer));
+
+            timer->m_isActive = false;
+        }
+
+        m_thread.interrupt ();
+    }
+
+    void threadRun ()
+    {
+        while (! m_shouldStop)
+        {
+            Time const currentTime = Time::getCurrentTime ();
+            double seconds = 0;
+
+            {
+                LockType::ScopedLockType lock (m_mutex);
+
+                // Notify everyone whose timer has expired
+                //
+                if (! m_items.empty ())
+                {
+                    for (;;)
+                    {
+                        Items::iterator const iter = m_items.begin ();
+
+                        // Has this timer expired?
+                        if (iter->m_notificationTime <= currentTime)
+                        {
+                            // Yes, so call the listener.
+                            //
+                            // Note that this happens while the lock is held.
+                            //
+                            iter->m_listener->onDeadlineTimer (*iter);
+
+                            // Remove it from the list.
+                            m_items.erase (iter);
+
+                            // Is the timer recurring?
+                            if (iter->m_secondsRecurring > 0)
+                            {
+                                // Yes so set the timer again.
+                                iter->m_notificationTime =
+                                    currentTime + RelativeTime (iter->m_secondsRecurring);
+
+                                // Keep it active.
+                                insertSorted (*iter);
+                            }
+                            else
+                            {
+                                // Not a recurring timer, deactivate it.
+                                iter->m_isActive = false;
+                            }
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                // Figure out how long we need to wait.
+                // This has to be done while holding the lock.
+                //
+                if (! m_items.empty ())
+                {
+                    seconds = (m_items.front ().m_notificationTime - currentTime).inSeconds ();
+                }
+                else
+                {
+                    seconds = 0;
+                }
+            }
+
+            // Note that we have released the lock here.
+            //
+            if (seconds > 0)
+            {
+                // Wait until interrupt or next timer.
+                //
+                m_thread.wait (static_cast <int> (seconds * 1000 + 0.5));
+            }
+            else if (seconds == 0)
+            {
+                // Wait until interrupt
+                //
+                m_thread.wait ();
+            }
+            else
+            {
+                // Do not wait. This can happen if the recurring timer duration
+                // is extremely short, or if a listener wastes too much time in
+                // their callback.
+            }
+        }
+    }
+
+    // Caller is responsible for locking
+    void insertSorted (DeadlineTimer& item)
+    {
+        if (! m_items.empty ())
+        {
+            Items::iterator before = m_items.begin ();
+
+            for (;;)
+            {
+                if (before->m_notificationTime >= item.m_notificationTime)
+                {
+                    m_items.insert (before, item);
+                    break;
+                }
+
+                ++before;
+
+                if (before == m_items.end ())
+                {
+                    m_items.push_back (item);
+                    break;
+                }
+            }
+        }
+        else
+        {
+            m_items.push_back (item);
+        }
+    }
+
+    static Manager* createInstance ()
+    {
+        return new Manager;
+    }
+
+private:
+    CriticalSection m_mutex;
+    bool volatile m_shouldStop;
+    InterruptibleThread m_thread;
+    Items m_items;
+};
+
+//------------------------------------------------------------------------------
+
+DeadlineTimer::DeadlineTimer (Listener* listener)
+    : m_listener (listener)
+    , m_manager (Manager::getInstance ())
+    , m_isActive (false)
+{
+}
+
+DeadlineTimer::~DeadlineTimer ()
+{
+    m_manager->deactivate (this);
+}
+
+void DeadlineTimer::setExpiration (double secondsUntilDeadline)
+{
+    bassert (secondsUntilDeadline > 0);
+
+    Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
+
+    m_manager->activate (this, 0, when);
+}
+
+void DeadlineTimer::setRecurringExpiration (double secondsUntilDeadline)
+{
+    bassert (secondsUntilDeadline > 0);
+
+    Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
+
+    m_manager->activate (this, secondsUntilDeadline, when);
+}
+
+void DeadlineTimer::setExpirationTime (Time const& when)
+{
+    m_manager->activate (this, 0, when);
+}
+
+void DeadlineTimer::reset ()
+{
+    m_manager->deactivate (this);
+}
--- a/Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.h
+++ b/Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.h
@@ -0,0 +1,121 @@
+//------------------------------------------------------------------------------
+/*
+    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_DEADLINETIMER_H_INCLUDED
+#define BEAST_DEADLINETIMER_H_INCLUDED
+
+/** Provides periodic or one time notifications at a specified time interval.
+*/
+class DeadlineTimer : public List <DeadlineTimer>::Node
+{
+public:
+    /** Listener for a deadline timer.
+
+        The listener is called on an auxiliary thread. It is suggested
+        not to perform any time consuming operations during the call.
+    */
+    // VFALCO TODO Allow construction with a specific ThreadWithCallQueue&
+    //             on which to notify the listener.
+    class Listener
+    {
+    public:
+        virtual void onDeadlineTimer (DeadlineTimer&) { }
+    };
+
+public:
+    /** Create a deadline timer with the specified listener attached.
+    */
+    explicit DeadlineTimer (Listener* listener);
+
+    ~DeadlineTimer ();
+
+    /** Set the timer to go off once in the future.
+
+        If the timer is already active, this will reset it.
+
+        @note If the timer is already active, a notification may still
+              occur due to concurrency.
+
+        @param secondsUntilDeadline The number of seconds until the timer
+                                    will send a notification. This must be
+                                    greater than zero.
+    */
+    void setExpiration (double secondsUntilDeadline);
+
+    /** Set the timer to go off repeatedly with the specified frequency.
+
+        If the timer is already active, this will reset it.
+
+        @note If the timer is already active, a notification may still
+              occur due to concurrency.
+
+        @param secondsUntilDeadline The number of seconds until the timer
+                                    will send a notification. This must be
+                                    greater than zero.
+    */
+    void setRecurringExpiration (double secondsUntilDeadline);
+
+    /** Set the timer to go off at a specific time.
+
+        If the timer is already active, this will reset it.
+
+        @note If the timer is already active, a notification may still
+              occur due to concurrency.
+
+        @note If the time is in the past, the timer will go off
+              immediately.
+    */
+    void setExpirationTime (Time const& when);
+
+    /** Reset the timer so that no more notifications are sent.
+
+        It is okay to call this on an inactive timer.
+
+        @note If the timer is already active, a notification may still
+              occur due to concurrency.
+    */
+    void reset ();
+
+    /** Equality comparison.
+
+        Timers are equal if they have the same address.
+    */
+    inline bool operator== (DeadlineTimer const& other) const
+    {
+        return this == &other;
+    }
+
+    /** Inequality comparison.
+    */
+    inline bool operator!= (DeadlineTimer const& other) const
+    {
+        return this != &other;
+    }
+
+private:
+    class Manager;
+
+    Listener* const m_listener;
+    ReferenceCountedObjectPtr <Manager> m_manager;
+    bool m_isActive;
+    Time m_notificationTime;
+    double m_secondsRecurring; // non zero if recurring
+};
+
+#endif
--- a/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.cpp
+++ b/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.cpp
@@ -18,12 +18,12 @@
 //==============================================================================

 class OncePerSecond::TimerSingleton
-    : public RefCountedSingleton <OncePerSecond::TimerSingleton>
+    : public SharedSingleton <OncePerSecond::TimerSingleton>
    , private InterruptibleThread::EntryPoint
 {
 private:
    TimerSingleton ()
-        : RefCountedSingleton <OncePerSecond::TimerSingleton> (
+        : SharedSingleton <OncePerSecond::TimerSingleton> (
            SingletonLifetime::persistAfterCreation)
        , m_thread ("Once Per Second")
    {
@@ -41,7 +41,7 @@ private:
    {
        for (;;)
        {
-            const bool interrupted = m_thread.wait (1000);
+            bool const interrupted = m_thread.wait (1000);

            if (interrupted)
                break;
--- a/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h
+++ b/Subtrees/beast/modules/beast_basics/events/beast_OncePerSecond.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_ONCEPERSECOND_BEASTHEADER
 #define BEAST_ONCEPERSECOND_BEASTHEADER

-#include "../containers/beast_List.h"
-
 /*============================================================================*/
 /**
    Provides a once per second notification.
@@ -32,7 +30,7 @@

    @ingroup beast_core
 */
-class OncePerSecond : Uncopyable
+class BEAST_API OncePerSecond : Uncopyable
 {
 public:
    OncePerSecond ();
--- a/Subtrees/beast/modules/beast_basics/functor/beast_Bind.h
+++ b/Subtrees/beast/modules/beast_basics/functor/beast_Bind.h
@@ -1,96 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    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_BIND_BEASTHEADER
-#define BEAST_BIND_BEASTHEADER
-
-/* Brings functional support into our namespace, based on environment.
-*/
-#if BEAST_MSVC
-// Visual Studio has these in std.
-using std::ref;
-using std::bind;
-using std::function;
-using std::placeholders::_1;
-using std::placeholders::_2;
-
-#elif BEAST_IOS
-#if BEAST_USE_BOOST
-/* If boost is activated, use it. This works
-   around a bug with the iOS implementation of bind.
-*/
-using boost::ref
-using boost::bind;
-using boost::function;
-using ::_1;
-using ::_2;
-#else
-#if _LIBCPP_VERSION // libc++
-using std::ref;
-using std::bind;
-using std::function;
-using std::placeholders::_1;
-using std::placeholders::_2;
-#else // libstdc++ (GNU)
-using std::tr1::ref;
-using std::tr1::bind;
-using std::tr1::function;
-using std::tr1::placeholders::_1;
-using std::tr1::placeholders::_2;
-#endif
-#endif
-
-#elif BEAST_MAC
-#if _LIBCPP_VERSION // libc++
-using std::ref;
-using std::bind;
-using std::function;
-using std::placeholders::_1;
-using std::placeholders::_2;
-#else // libstdc++ (GNU)
-using std::tr1::ref;
-using std::tr1::bind;
-using std::tr1::function;
-using std::tr1::placeholders::_1;
-using std::tr1::placeholders::_2;
-#endif
-
-#elif BEAST_LINUX
-using std::tr1::bind;
-using std::tr1::placeholders::_1;
-using std::tr1::placeholders::_2;
-
-#else
-#error Unknown platform in beast_Bind.h
-
-#endif
-
-/** Max number of arguments to bind, total.
-*/
-#if BEAST_MSVC
-# ifdef _VARIADIC_MAX
-#  define BEAST_VARIADIC_MAX _VARIADIC_MAX
-# else
-#  define BEAST_VARIADIC_MAX 9
-# endif
-#else
-# define BEAST_VARIADIC_MAX 9
-#endif
-
-#endif
--- a/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.h
+++ b/Subtrees/beast/modules/beast_basics/math/beast_MurmurHash.h
@@ -22,7 +22,7 @@

 // Original source code links in .cpp file

-// This file depends on some Juce declarations and defines
+// This file depends on some Beast declarations and defines

 namespace Murmur
 {
@@ -31,7 +31,7 @@ extern void MurmurHash3_x86_32  (const void* key, int len, uint32 seed, void* ou
 extern void MurmurHash3_x86_128 (const void* key, int len, uint32 seed, void* out);
 extern void MurmurHash3_x64_128 (const void* key, int len, uint32 seed, void* out);

-// Uses Juce to choose an appropriate routine
+// Uses Beast to choose an appropriate routine

 // This handy template deduces which size hash is desired
 template <typename HashType>
@@ -44,15 +44,15 @@ inline void Hash (const void* key, int len, uint32 seed, HashType* out)
        break;

 #if BEAST_64BIT
-
    case 128:
        MurmurHash3_x64_128 (key, len, seed, out);
        break;
-#else

+#else
    case 128:
        MurmurHash3_x86_128 (key, len, seed, out);
        break;
+
 #endif

    default:
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStore.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStore.h
@@ -20,19 +20,16 @@
 #ifndef BEAST_FIFOFREESTORE_BEASTHEADER
 #define BEAST_FIFOFREESTORE_BEASTHEADER

-#if BEAST_USE_BOOST
-#include "beast_FifoFreeStoreWithTLS.h"
-
-#else
-#include "beast_FifoFreeStoreWithoutTLS.h"
-
-#endif
-
 /** Selected free store based on compilation settings.

    @ingroup beast_concurrent
 */
-#if BEAST_USE_BOOST
+// VFALCO NOTE Disabled this because it seems that the TLS
+//             implementation has a leak. Although the other
+//             one also seems to have a leak.
+//
+//#if BEAST_BOOST_IS_AVAILABLE
+#if 0
 typedef FifoFreeStoreWithTLS FifoFreeStoreType;
 #else
 typedef FifoFreeStoreWithoutTLS FifoFreeStoreType;
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp
@@ -32,6 +32,8 @@
 //   affecting performance.
 //

+#if BEAST_BOOST_IS_AVAILABLE
+
 // This precedes every allocation
 //
 struct FifoFreeStoreWithTLS::Header
@@ -192,3 +194,5 @@ void FifoFreeStoreWithTLS::deallocate (void* p)
    if (page->release ())
        deletePage (page);
 }
+
+#endif
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.h
@@ -20,7 +20,7 @@
 #ifndef BEAST_FIFOFREESTOREWITHTLS_BEASTHEADER
 #define BEAST_FIFOFREESTOREWITHTLS_BEASTHEADER

-#include "beast_GlobalPagedFreeStore.h"
+#if BEAST_BOOST_IS_AVAILABLE

 /*============================================================================*/
 /**
@@ -39,7 +39,7 @@

  @ingroup beast_concurrent
 */
-class FifoFreeStoreWithTLS
+class BEAST_API FifoFreeStoreWithTLS
 {
 public:
    FifoFreeStoreWithTLS ();
@@ -65,3 +65,5 @@ private:
 };

 #endif
+
+#endif
--- a/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_FIFOFREESTOREWITHOUTTLS_BEASTHEADER
 #define BEAST_FIFOFREESTOREWITHOUTTLS_BEASTHEADER

-#include "beast_GlobalPagedFreeStore.h"
-
 /*============================================================================*/
 /**
  Lock-free FIFO memory allocator.
@@ -40,7 +38,7 @@

  @ingroup beast_concurrent
 */
-class FifoFreeStoreWithoutTLS
+class BEAST_API FifoFreeStoreWithoutTLS
 {
 public:
    explicit FifoFreeStoreWithoutTLS ();
--- a/Subtrees/beast/modules/beast_basics/memory/beast_GlobalFifoFreeStore.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_GlobalFifoFreeStore.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_GLOBALFIFOFREESTORE_BEASTHEADER
 #define BEAST_GLOBALFIFOFREESTORE_BEASTHEADER

-#include "beast_FifoFreeStore.h"
-
 /*============================================================================*/
 /**
  A @ref FifoFreeStoreType singleton.
@@ -29,7 +27,7 @@
  @ingroup beast_concurrent
 */
 template <class Tag>
-class GlobalFifoFreeStore : public RefCountedSingleton <GlobalFifoFreeStore <Tag> >
+class GlobalFifoFreeStore : public SharedSingleton <GlobalFifoFreeStore <Tag> >
 {
 public:
    inline void* allocate (size_t bytes)
@@ -49,7 +47,7 @@ public:

 private:
    GlobalFifoFreeStore ()
-        : RefCountedSingleton <GlobalFifoFreeStore <Tag> >
+        : SharedSingleton <GlobalFifoFreeStore <Tag> >
        (SingletonLifetime::persistAfterCreation)
    {
    }
--- a/Subtrees/beast/modules/beast_basics/memory/beast_GlobalPagedFreeStore.cpp
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_GlobalPagedFreeStore.cpp
@@ -27,7 +27,7 @@ static const size_t globalPageBytes = 8 * 1024;
 }

 GlobalPagedFreeStore::GlobalPagedFreeStore ()
-    : RefCountedSingleton <GlobalPagedFreeStore> (SingletonLifetime::persistAfterCreation)
+    : SharedSingleton <GlobalPagedFreeStore> (SingletonLifetime::persistAfterCreation)
    , m_allocator (globalPageBytes)
 {
 }
--- a/Subtrees/beast/modules/beast_basics/memory/beast_GlobalPagedFreeStore.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_GlobalPagedFreeStore.h
@@ -20,16 +20,14 @@
 #ifndef BEAST_GLOBALPAGEDFREESTORE_BEASTHEADER
 #define BEAST_GLOBALPAGEDFREESTORE_BEASTHEADER

-#include "beast_PagedFreeStore.h"
-
 /*============================================================================*/
 /**
  A PagedFreeStore singleton.

  @ingroup beast_concurrent
 */
-class GlobalPagedFreeStore
-    : public RefCountedSingleton <GlobalPagedFreeStore>
+class BEAST_API GlobalPagedFreeStore
+    : public SharedSingleton <GlobalPagedFreeStore>
    , LeakChecked <GlobalPagedFreeStore>
 {
 private:
--- a/Subtrees/beast/modules/beast_basics/memory/beast_PagedFreeStore.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_PagedFreeStore.h
@@ -29,7 +29,7 @@

  @ingroup beast_concurrent
 */
-class PagedFreeStore : private OncePerSecond
+class BEAST_API PagedFreeStore : private OncePerSecond
 {
 public:
    explicit PagedFreeStore (const size_t pageBytes);
--- a/Subtrees/beast/modules/beast_basics/threads/beast_CallQueue.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_CallQueue.h
@@ -131,7 +131,7 @@

  @ingroup beast_concurrent
 */
-class CallQueue
+class BEAST_API CallQueue
 {
 public:
    //============================================================================
@@ -313,11 +313,11 @@ public:

        struct SharedState;           // contains data shared between threads

-        ConcurrentState <SharedState> sharedState;
+        SharedData <SharedState> sharedState;

        void stateChanged ()
        {
-          ConcurrentState <SharedState>::ReadAccess state (sharedState);
+          SharedData <SharedState>::ReadAccess state (sharedState);

          // (read state)
        }
@@ -326,7 +326,7 @@ public:

        void changeState ()
        {
-          ConcurrentState <State>::WriteAccess state (sharedState);
+          SharedData <State>::WriteAccess state (sharedState);

          // (read and write state)

--- a/Subtrees/beast/modules/beast_basics/threads/beast_ConcurrentObject.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ConcurrentObject.h
@@ -41,7 +41,7 @@

  @ingroup beast_concurrent
 */
-class ConcurrentObject : Uncopyable
+class BEAST_API ConcurrentObject : Uncopyable
 {
 public:
    inline void incReferenceCount () noexcept
--- a/Subtrees/beast/modules/beast_basics/threads/beast_GlobalThreadGroup.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_GlobalThreadGroup.h
@@ -28,14 +28,14 @@

  @ingroup beast_concurrent
 */
-class GlobalThreadGroup : public ThreadGroup,
-    public RefCountedSingleton <GlobalThreadGroup>
+class BEAST_API GlobalThreadGroup : public ThreadGroup,
+    public SharedSingleton <GlobalThreadGroup>
 {
 private:
-    friend class RefCountedSingleton <GlobalThreadGroup>;
+    friend class SharedSingleton <GlobalThreadGroup>;

    GlobalThreadGroup ()
-        : RefCountedSingleton <GlobalThreadGroup> (
+        : SharedSingleton <GlobalThreadGroup> (
            SingletonLifetime::persistAfterCreation)
    {
    }
--- a/Subtrees/beast/modules/beast_basics/threads/beast_InterruptibleThread.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_InterruptibleThread.h
@@ -20,9 +20,6 @@
 #ifndef BEAST_INTERRUPTIBLETHREAD_BEASTHEADER
 #define BEAST_INTERRUPTIBLETHREAD_BEASTHEADER

-#include "../diagnostic/beast_SafeBool.h"
-#include "../functor/beast_Function.h"
-
 //==============================================================================
 /**
    A thread with soft interruption support.
@@ -36,7 +33,7 @@

    @ingroup beast_core
 */
-class InterruptibleThread
+class BEAST_API InterruptibleThread
 {
 public:
    /** InterruptibleThread entry point.
--- a/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_Listeners.h
@@ -137,7 +137,7 @@
    void addListener (Listener* listener, CallQueue& callQueue)
    {
      // Acquire read access to the shared state.
-      ConcurrentState <State>::ReadAccess state (m_state);
+      SharedData <State>::ReadAccess state (m_state);

      // Add the listener.
      m_listeners.add (listener, callQueue);
@@ -171,7 +171,7 @@

      // Update shared state.
      {
-        ConcurrentState <State>::WriteAccess state (m_state);
+        SharedData <State>::WriteAccess state (m_state);

        m_state->outputLevel = newOutputLevel;
      }
@@ -188,7 +188,7 @@
      float outputLevel;
    };

-    ConcurrentState <State> m_state;
+    SharedData <State> m_state;

    ManualCallQueue m_fifo;
  };
@@ -205,7 +205,7 @@
  @class Listeners
  @ingroup beast_concurrent
 */
-class ListenersBase
+class BEAST_API ListenersBase
 {
 public:
    struct ListenersStructureTag { };
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ParallelFor.h
@@ -52,7 +52,7 @@

  @ingroup beast_concurrent
 */
-class ParallelFor : Uncopyable
+class BEAST_API ParallelFor : Uncopyable
 {
 public:
    /** Create a parallel for loop.
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ReadWriteMutex.h
@@ -47,7 +47,8 @@
  @ingroup beast_concurrent
 */

-/*============================================================================*/
+//------------------------------------------------------------------------------
+
 /**
  Scoped read lock for ReadWriteMutex.

@@ -72,7 +73,8 @@ private:
    LockType const& m_lock;
 };

-/*============================================================================*/
+//------------------------------------------------------------------------------
+
 /**
  Scoped write lock for ReadWriteMutex.

@@ -97,7 +99,9 @@ private:
    LockType const& m_lock;
 };

-class ReadWriteMutex
+//------------------------------------------------------------------------------
+
+class BEAST_API ReadWriteMutex
 {
 public:
    /** Provides the type of scoped read lock to use with a ReadWriteMutex. */
--- a/Subtrees/beast/modules/beast_basics/threads/beast_Semaphore.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_Semaphore.h
@@ -31,7 +31,7 @@

  @ingroup beast_core
 */
-class Semaphore
+class BEAST_API Semaphore
 {
 public:
    /** Create a semaphore with the specified number of resources.
--- a/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_SerialFor.h
@@ -31,7 +31,7 @@

    @ingroup beast_core
 */
-class SerialFor : Uncopyable
+class BEAST_API SerialFor : Uncopyable
 {
 public:
    /** Create a serial for loop.
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ConcurrentState.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ConcurrentState.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================

-#ifndef BEAST_CONCURRENTSTATE_BEASTHEADER
-#define BEAST_CONCURRENTSTATE_BEASTHEADER
+#ifndef BEAST_SHAREDDATA_H_INCLUDED
+#define BEAST_SHAREDDATA_H_INCLUDED

 /*============================================================================*/
 /**
@@ -52,7 +52,7 @@
    It also makes it easier to search for places in code which use unlocked
    access.

-  This code example demonstrates various forms of access to a ConcurrentState:
+  This code example demonstrates various forms of access to a SharedData:

  @code

@@ -62,7 +62,7 @@
    String value2;
  };

-  typedef ConcurrentState <SharedData> SharedState;
+  typedef SharedData <SharedData> SharedState;

  SharedState sharedState;

@@ -101,7 +101,7 @@
  };

  // Construct SharedData with one parameter
-  ConcurrentState <SharedData> sharedState (16);
+  SharedData <SharedData> sharedState (16);

  @endcode

@@ -112,11 +112,9 @@
  read access. Such an attempt will result in undefined behavior. Calling into
  unknown code while holding a lock can cause deadlock. See
  @ref CallQueue::queue().
-
-  @ingroup beast_concurrent
 */
 template <class Object>
-class ConcurrentState : Uncopyable
+class SharedData : Uncopyable
 {
 public:
    class ReadAccess;
@@ -131,37 +129,37 @@ public:
        generated.
    */
    /** @{ */
-    ConcurrentState () { }
+    SharedData () { }

    template <class T1>
-    explicit ConcurrentState (T1 t1)
+    explicit SharedData (T1 t1)
        : m_obj (t1) { }

    template <class T1, class T2>
-    ConcurrentState (T1 t1, T2 t2)
+    SharedData (T1 t1, T2 t2)
        : m_obj (t1, t2) { }

    template <class T1, class T2, class T3>
-    ConcurrentState (T1 t1, T2 t2, T3 t3)
+    SharedData (T1 t1, T2 t2, T3 t3)
        : m_obj (t1, t2, t3) { }

    template <class T1, class T2, class T3, class T4>
-    ConcurrentState (T1 t1, T2 t2, T3 t3, T4 t4)
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4)
        : m_obj (t1, t2, t3, t4) { }

    template <class T1, class T2, class T3, class T4, class T5>
-    ConcurrentState (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5)
        : m_obj (t1, t2, t3, t4, t5) { }

    template <class T1, class T2, class T3, class T4, class T5, class T6>
-    ConcurrentState (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
        : m_obj (t1, t2, t3, t4, t5, t6) { }

    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7>
-    ConcurrentState (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) : m_obj (t1, t2, t3, t4, t5, t6, t7) { }
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) : m_obj (t1, t2, t3, t4, t5, t6, t7) { }

    template <class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8>
-    ConcurrentState (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
+    SharedData (T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8)
        : m_obj (t1, t2, t3, t4, t5, t6, t7, t8) { }
    /** @} */

@@ -174,15 +172,15 @@ private:

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

-/** Unlocked access to a ConcurrentState.
+/** Unlocked access to a SharedData.

    Use sparingly.
 */
 template <class Object>
-class ConcurrentState <Object>::UnlockedAccess : Uncopyable
+class SharedData <Object>::UnlockedAccess : Uncopyable
 {
 public:
-    explicit UnlockedAccess (ConcurrentState const& state)
+    explicit UnlockedAccess (SharedData const& state)
        : m_state (state)
    {
    }
@@ -201,19 +199,19 @@ public:
    }

 private:
-    ConcurrentState const& m_state;
+    SharedData const& m_state;
 };

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

-/** Read only access to a ConcurrentState */
+/** Read only access to a SharedData */
 template <class Object>
-class ConcurrentState <Object>::ReadAccess : Uncopyable
+class SharedData <Object>::ReadAccess : Uncopyable
 {
 public:
-    /** Create a ReadAccess from the specified ConcurrentState */
-    explicit ReadAccess (ConcurrentState const volatile& state)
-        : m_state (const_cast <ConcurrentState const&> (state))
+    /** Create a ReadAccess from the specified SharedData */
+    explicit ReadAccess (SharedData const volatile& state)
+        : m_state (const_cast <SharedData const&> (state))
        , m_lock (m_state.m_mutex)
    {
    }
@@ -237,18 +235,18 @@ public:
    }

 private:
-    ConcurrentState const& m_state;
+    SharedData const& m_state;
    ReadWriteMutexType::ScopedReadLockType m_lock;
 };

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

-/** Read/write access to a ConcurrentState */
+/** Read/write access to a SharedData */
 template <class Object>
-class ConcurrentState <Object>::WriteAccess : Uncopyable
+class SharedData <Object>::WriteAccess : Uncopyable
 {
 public:
-    explicit WriteAccess (ConcurrentState& state)
+    explicit WriteAccess (SharedData& state)
        : m_state (state)
        , m_lock (m_state.m_mutex)
    {
@@ -291,7 +289,7 @@ public:
    }

 private:
-    ConcurrentState& m_state;
+    SharedData& m_state;
    ReadWriteMutexType::ScopedWriteLockType m_lock;
 };

--- a/Subtrees/beast/modules/beast_basics/threads/beast_SharedObject.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_SharedObject.h
@@ -32,7 +32,7 @@

    @ingroup beast_concurrent
 */
-class SharedObject : Uncopyable
+class BEAST_API SharedObject : Uncopyable
 {
 public:
    /** Abstract SharedObject scope.
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ThreadGroup.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ThreadGroup.h
@@ -28,7 +28,7 @@

  @see ParallelFor
 */
-class ThreadGroup
+class BEAST_API ThreadGroup
 {
 public:
    typedef FifoFreeStoreType AllocatorType;
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ThreadWithCallQueue.cpp
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ThreadWithCallQueue.cpp
@@ -32,6 +32,13 @@ ThreadWithCallQueue::~ThreadWithCallQueue ()
    stop (true);
 }

+ThreadWithCallQueue::EntryPoints* ThreadWithCallQueue::getDefaultEntryPoints () noexcept
+{
+    static EntryPoints entryPoints;
+
+    return &entryPoints;
+}
+
 void ThreadWithCallQueue::start (EntryPoints* const entryPoints)
 {
    {
--- a/Subtrees/beast/modules/beast_basics/threads/beast_ThreadWithCallQueue.h
+++ b/Subtrees/beast/modules/beast_basics/threads/beast_ThreadWithCallQueue.h
@@ -20,29 +20,28 @@
 #ifndef BEAST_THREADWITHCALLQUEUE_BEASTHEADER
 #define BEAST_THREADWITHCALLQUEUE_BEASTHEADER

-/*============================================================================*/
-/**
-  An InterruptibleThread with a CallQueue.
+/** An InterruptibleThread with a CallQueue.

-  This combines an InterruptibleThread with a CallQueue, allowing functors to
-  be queued for asynchronous execution on the thread.
+    This combines an InterruptibleThread with a CallQueue, allowing functors to
+    be queued for asynchronous execution on the thread.

-  The thread runs an optional user-defined idle function, which must regularly
-  check for an interruption using the InterruptibleThread interface. When an
-  interruption is signaled, the idle function returns and the CallQueue is
-  synchronized. Then, the idle function is resumed.
+    The thread runs an optional user-defined idle function, which must regularly
+    check for an interruption using the InterruptibleThread interface. When an
+    interruption is signaled, the idle function returns and the CallQueue is
+    synchronized. Then, the idle function is resumed.

-  When the ThreadWithCallQueue first starts up, an optional user-defined
-  initialization function is executed on the thread. When the thread exits,
-  a user-defined exit function may be executed on the thread.
+    When the ThreadWithCallQueue first starts up, an optional user-defined
+    initialization function is executed on the thread. When the thread exits,
+    a user-defined exit function may be executed on the thread.

-  @see CallQueue
+    @see CallQueue

-  @ingroup beast_concurrent
+    @ingroup beast_concurrent
 */
-class ThreadWithCallQueue
+class BEAST_API ThreadWithCallQueue
    : public CallQueue
    , private InterruptibleThread::EntryPoint
+    , LeakChecked <ThreadWithCallQueue>
 {
 public:
    /** Entry points for a ThreadWithCallQueue.
@@ -71,6 +70,12 @@ public:
    */
    explicit ThreadWithCallQueue (String name);

+    /** Retrieve the default entry points.
+
+        The default entry points do nothing.
+    */
+    static EntryPoints* getDefaultEntryPoints () noexcept;
+
    /** Destroy a ThreadWithCallQueue.

        If the thread is still running it is stopped. The destructor blocks
@@ -78,9 +83,16 @@ public:
    */
    ~ThreadWithCallQueue ();

-    /** Start the thread.
+    /** Start the thread, with optional entry points.
+
+        If `entryPoints` is specified then the thread runs using those
+        entry points. If ommitted, the default entry simply do nothing.
+        This is useful for creating a thread whose sole activities are
+        performed through the call queue.
+
+        @param entryPoints An optional pointer to @ref EntryPoints.
    */
-    void start (EntryPoints* const entryPoints);
+    void start (EntryPoints* const entryPoints = getDefaultEntryPoints ());

    /* Stop the thread.

@@ -102,18 +114,17 @@ public:

    void stop (bool const wait);

-    /**
-      Determine if the thread needs interruption.
+    /** Determine if the thread needs interruption.

-      Should be called periodically by the idle function. If interruptionPoint
-      returns true or throws, it must not be called again until the idle function
-      returns and is re-entered.
+        Should be called periodically by the idle function. If interruptionPoint
+        returns true or throws, it must not be called again until the idle function
+        returns and is re-entered.

-      @invariant No previous calls to interruptionPoint() made after the idle
-                 function entry point returned `true`.
+        @invariant No previous calls to interruptionPoint() made after the idle
+                   function entry point returned `true`.

-      @return `false` if the idle function may continue, or `true` if the
-              idle function must return as soon as possible.
+        @return `false` if the idle function may continue, or `true` if the
+                idle function must return as soon as possible.
    */
    bool interruptionPoint ();

--- a/Subtrees/beast/modules/beast_core/beast_core.cpp
+++ b/Subtrees/beast/modules/beast_core/beast_core.cpp
@@ -102,8 +102,39 @@
 #include <android/log.h>
 #endif

+//------------------------------------------------------------------------------
+
+// If the MSVC debug heap headers were included, disable
+// the macros during the juce include since they conflict.
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma push_macro("calloc")
+#pragma push_macro("free")
+#pragma push_macro("malloc")
+#pragma push_macro("realloc")
+#pragma push_macro("_recalloc")
+#pragma push_macro("_aligned_free")
+#pragma push_macro("_aligned_malloc")
+#pragma push_macro("_aligned_offset_malloc")
+#pragma push_macro("_aligned_realloc")
+#pragma push_macro("_aligned_recalloc")
+#pragma push_macro("_aligned_offset_realloc")
+#pragma push_macro("_aligned_offset_recalloc")
+#pragma push_macro("_aligned_msize")
+#undef calloc
+#undef free
+#undef malloc
+#undef realloc
+#undef _recalloc
+#undef _aligned_free
+#undef _aligned_malloc
+#undef _aligned_offset_malloc
+#undef _aligned_realloc
+#undef _aligned_recalloc
+#undef _aligned_offset_realloc
+#undef _aligned_offset_recalloc
+#undef _aligned_msize
+#endif

-//==============================================================================
 namespace beast
 {

@@ -112,26 +143,39 @@ namespace beast
 #include "containers/beast_NamedValueSet.cpp"
 #include "containers/beast_PropertySet.cpp"
 #include "containers/beast_Variant.cpp"
+
+#include "diagnostic/beast_Debug.cpp"
+#include "diagnostic/beast_Error.cpp"
+#include "diagnostic/beast_FPUFlags.cpp"
+#include "diagnostic/beast_LeakChecked.cpp"
+
 #include "files/beast_DirectoryIterator.cpp"
 #include "files/beast_File.cpp"
 #include "files/beast_FileInputStream.cpp"
 #include "files/beast_FileOutputStream.cpp"
 #include "files/beast_FileSearchPath.cpp"
 #include "files/beast_TemporaryFile.cpp"
+
 #include "json/beast_JSON.cpp"
+
 #include "logging/beast_FileLogger.cpp"
 #include "logging/beast_Logger.cpp"
+
 #include "maths/beast_BigInteger.cpp"
 #include "maths/beast_Expression.cpp"
 #include "maths/beast_Random.cpp"
+
 #include "memory/beast_MemoryBlock.cpp"
+
 #include "misc/beast_Result.cpp"
 #include "misc/beast_Uuid.cpp"
+
 #include "network/beast_MACAddress.cpp"
 #include "network/beast_NamedPipe.cpp"
 #include "network/beast_Socket.cpp"
 #include "network/beast_URL.cpp"
 #include "network/beast_IPAddress.cpp"
+
 #include "streams/beast_BufferedInputStream.cpp"
 #include "streams/beast_FileInputSource.cpp"
 #include "streams/beast_InputStream.cpp"
@@ -139,8 +183,11 @@ namespace beast
 #include "streams/beast_MemoryOutputStream.cpp"
 #include "streams/beast_OutputStream.cpp"
 #include "streams/beast_SubregionStream.cpp"
+
 #include "system/beast_SystemStats.cpp"
+
 #include "text/beast_CharacterFunctions.cpp"
+
 #include "text/beast_Identifier.cpp"
 #include "text/beast_LocalisedStrings.cpp"
 #include "text/beast_String.cpp"
@@ -148,26 +195,38 @@ namespace beast
 #include "text/beast_StringPairArray.cpp"
 #include "text/beast_StringPool.cpp"
 #include "text/beast_TextDiff.cpp"
+
 #include "threads/beast_ChildProcess.cpp"
 #include "threads/beast_ReadWriteLock.cpp"
+#include "threads/beast_SpinDelay.cpp"
 #include "threads/beast_Thread.cpp"
 #include "threads/beast_ThreadPool.cpp"
 #include "threads/beast_TimeSliceThread.cpp"
+
 #include "time/beast_PerformanceCounter.cpp"
+#include "time/beast_PerformedAtExit.cpp"
 #include "time/beast_RelativeTime.cpp"
 #include "time/beast_Time.cpp"
+
 #include "unit_tests/beast_UnitTest.cpp"
+
 #include "xml/beast_XmlDocument.cpp"
 #include "xml/beast_XmlElement.cpp"
+
 #include "zip/beast_GZIPDecompressorInputStream.cpp"
 #include "zip/beast_GZIPCompressorOutputStream.cpp"
 #include "zip/beast_ZipFile.cpp"

-//==============================================================================
 #if BEAST_MAC || BEAST_IOS
 #include "native/beast_osx_ObjCHelpers.h"
 #endif

+#if BEAST_WINDOWS
+#include "native/beast_win32_FPUFlags.cpp"
+#else
+#include "native/beast_posix_FPUFlags.cpp"
+#endif
+
 #if BEAST_ANDROID
 #include "native/beast_android_JNIHelpers.h"
 #endif
@@ -177,7 +236,6 @@ namespace beast
 #include "native/beast_posix_NamedPipe.cpp"
 #endif

-//==============================================================================
 #if BEAST_MAC || BEAST_IOS
 #include "native/beast_mac_Files.mm"
 #include "native/beast_mac_Network.mm"
@@ -185,7 +243,6 @@ namespace beast
 #include "native/beast_mac_SystemStats.mm"
 #include "native/beast_mac_Threads.mm"

-//==============================================================================
 #elif BEAST_WINDOWS
 #include "native/beast_win32_ComSmartPtr.h"
 #include "native/beast_win32_Files.cpp"
@@ -194,14 +251,18 @@ namespace beast
 #include "native/beast_win32_SystemStats.cpp"
 #include "native/beast_win32_Threads.cpp"

-//==============================================================================
 #elif BEAST_LINUX
 #include "native/beast_linux_Files.cpp"
 #include "native/beast_linux_Network.cpp"
 #include "native/beast_linux_SystemStats.cpp"
 #include "native/beast_linux_Threads.cpp"

-//==============================================================================
+#elif BEAST_BSD
+#include "native/beast_bsd_Files.cpp"
+#include "native/beast_bsd_Network.cpp"
+#include "native/beast_bsd_SystemStats.cpp"
+#include "native/beast_bsd_Threads.cpp"
+
 #elif BEAST_ANDROID
 #include "native/beast_android_Files.cpp"
 #include "native/beast_android_Misc.cpp"
@@ -214,3 +275,37 @@ namespace beast
 #include "threads/beast_HighResolutionTimer.cpp"

 }
+
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma pop_macro("calloc")
+#pragma pop_macro("free")
+#pragma pop_macro("malloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_msize")
+#endif
+
+//------------------------------------------------------------------------------
+
+#if BEAST_BOOST_IS_AVAILABLE
+namespace boost {
+namespace placeholders {
+boost::arg<1> _1;
+boost::arg<2> _2;
+boost::arg<3> _3;
+boost::arg<4> _4;
+boost::arg<5> _5;
+boost::arg<6> _6;
+boost::arg<7> _7;
+boost::arg<8> _8;
+boost::arg<9> _9;
+}
+}
+#endif
--- a/Subtrees/beast/modules/beast_core/beast_core.h
+++ b/Subtrees/beast/modules/beast_core/beast_core.h
@@ -21,89 +21,52 @@
 */
 //==============================================================================

-#ifndef BEAST_CORE_BEASTHEADER
-#define BEAST_CORE_BEASTHEADER
+#ifndef BEAST_CORE_H_INCLUDED
+#define BEAST_CORE_H_INCLUDED

-#ifndef BEAST_BEASTCONFIG_HEADER
- /* If you fail to make sure that all your compile units are building Beast with the same set of
-    option flags, then there's a risk that different compile units will treat the classes as having
-    different memory layouts, leading to very nasty memory corruption errors when they all get
-    linked together. That's why it's best to always include the BeastConfig.h file before any beast headers.
- */
- #ifdef _MSC_VER
-#pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
- #else
-  #warning "Have you included your BeastConfig.h file before including the Beast headers?"
- #endif
+//------------------------------------------------------------------------------
+
+/*  If you fail to make sure that all your compile units are building Beast with
+    the same set of option flags, then there's a risk that different compile
+    units will treat the classes as having different memory layouts, leading to
+    very nasty memory corruption errors when they all get linked together.
+    That's why it's best to always include the BeastConfig.h file before any
+    beast headers.
+*/
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+# ifdef _MSC_VER
+#  pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
+# else
+#  warning "Have you included your BeastConfig.h file before including the Beast headers?"
+# endif
 #endif

-//==============================================================================
+//------------------------------------------------------------------------------
+
 #include "system/beast_TargetPlatform.h"

-//=============================================================================
-/** Config: BEAST_FORCE_DEBUG
+//
+// Apply sensible defaults for the configuration settings
+//

-    Normally, BEAST_DEBUG is set to 1 or 0 based on compiler and project settings,
-    but if you define this value, you can override this to force it to be true or false.
-*/
-#ifndef BEAST_FORCE_DEBUG
- //#define BEAST_FORCE_DEBUG 0
-#endif
-
-//=============================================================================
-/** Config: BEAST_LOG_ASSERTIONS
-
-    If this flag is enabled, the the bassert and bassertfalse macros will always use Logger::writeToLog()
-    to write a message when an assertion happens.
-
-    Enabling it will also leave this turned on in release builds. When it's disabled,
-    however, the bassert and bassertfalse macros will not be compiled in a
-    release build.
-
-    @see bassert, bassertfalse, Logger
-*/
 #ifndef BEAST_LOG_ASSERTIONS
- #if BEAST_ANDROID
-  #define BEAST_LOG_ASSERTIONS 1
- #else
-  #define BEAST_LOG_ASSERTIONS 0
- #endif
+# if BEAST_ANDROID
+#  define BEAST_LOG_ASSERTIONS 1
+# else
+#  define BEAST_LOG_ASSERTIONS 0
+# endif
 #endif

-//=============================================================================
-/** Config: BEAST_CHECK_MEMORY_LEAKS
-
-    Enables a memory-leak check for certain objects when the app terminates. See the LeakedObjectDetector
-    class and the BEAST_LEAK_DETECTOR macro for more details about enabling leak checking for specific classes.
-*/
 #if BEAST_DEBUG && ! defined (BEAST_CHECK_MEMORY_LEAKS)
- #define BEAST_CHECK_MEMORY_LEAKS 1
+#define BEAST_CHECK_MEMORY_LEAKS 1
 #endif

-//=============================================================================
-/** Config: BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
-
-    In a Visual C++  build, this can be used to stop the required system libs being
-    automatically added to the link stage.
-*/
-#ifndef BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES
- #define BEAST_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
-#endif
-
-/*  Config: BEAST_INCLUDE_ZLIB_CODE
-    This can be used to disable Beast's embedded 3rd-party zlib code.
-    You might need to tweak this if you're linking to an external zlib library in your app,
-    but for normal apps, this option should be left alone.
-
-    If you disable this, you might also want to set a value for BEAST_ZLIB_INCLUDE_PATH, to
-    specify the path where your zlib headers live.
-*/
 #ifndef BEAST_INCLUDE_ZLIB_CODE
- #define BEAST_INCLUDE_ZLIB_CODE 1
+#define BEAST_INCLUDE_ZLIB_CODE 1
 #endif

 #ifndef BEAST_ZLIB_INCLUDE_PATH
- #define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
+#define BEAST_ZLIB_INCLUDE_PATH <zlib.h>
 #endif

 /*  Config: BEAST_CATCH_UNHANDLED_EXCEPTIONS
@@ -111,330 +74,274 @@
    to your BEASTApplication::unhandledException() callback.
 */
 #ifndef BEAST_CATCH_UNHANDLED_EXCEPTIONS
- //#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 1
+//#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 1
 #endif

-//=============================================================================
-//=============================================================================
-#if BEAST_MSVC
- #pragma warning (disable: 4251) // (DLL build warning, must be disabled before pushing the warning state)
- #pragma warning (push)
- #pragma warning (disable: 4786) // (long class name warning)
- #ifdef __INTEL_COMPILER
-  #pragma warning (disable: 1125)
- #endif
+#ifndef BEAST_BOOST_IS_AVAILABLE
+#define BEAST_BOOST_IS_AVAILABLE 0
 #endif

+//------------------------------------------------------------------------------
+//
+// This is a hack to fix boost's goofy placeholders
+//
+
+#if BEAST_BOOST_IS_AVAILABLE
+#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+#error <boost/bind.hpp> must not be included before this file
+#endif
+// Prevent <boost/bind/placeholders.hpp> from being included
+#define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+#include <boost/bind/arg.hpp>
+#include <boost/config.hpp>
+// This based on <boost/bind/placeholders.cpp>
+namespace boost {
+namespace placeholders {
+extern boost::arg<1> _1;
+extern boost::arg<2> _2;
+extern boost::arg<3> _3;
+extern boost::arg<4> _4;
+extern boost::arg<5> _5;
+extern boost::arg<6> _6;
+extern boost::arg<7> _7;
+extern boost::arg<8> _8;
+extern boost::arg<9> _9;
+}
+using namespace placeholders;
+}
+#endif
+
+//------------------------------------------------------------------------------
+//
+// Choose a source of bind, placeholders, and function
+//
+
+#if !BEAST_BIND_USES_STD && !BEAST_BIND_USES_TR1 && !BEAST_BIND_USES_BOOST
+# if BEAST_MSVC
+#  define BEAST_BIND_USES_STD 1
+# elif BEAST_IOS || BEAST_MAC
+#  include <ciso646>                        // detect version of std::lib
+#  if BEAST_IOS && BEAST_BOOST_IS_AVAILABLE // Work-around for iOS bugs with bind.
+#   define BEAST_BIND_USES_BOOST 1
+#  elif _LIBCPP_VERSION // libc++
+#   define BEAST_BIND_USES_STD 1
+#  else // libstdc++ (GNU)
+#   define BEAST_BIND_USES_TR1 1
+#  endif
+# elif BEAST_LINUX || BEAST_BSD
+#  define BEAST_BIND_USES_TR1 1
+# else
+#  define BEAST_BIND_USES_STD 1
+# endif
+#endif
+
+#if BEAST_BIND_USES_STD
+# include <functional>
+#elif BEAST_BIND_USES_TR1
+# include <tr1/functional>
+#elif BEAST_BIND_USES_BOOST
+# include <boost/bind.hpp>
+# include <boost/function.hpp>
+#endif
+
+//------------------------------------------------------------------------------
+
 #include "system/beast_StandardHeader.h"

+#if BEAST_MSVC
+# pragma warning (disable: 4251) // (DLL build warning, must be disabled before pushing the warning state)
+# pragma warning (push)
+# pragma warning (disable: 4786) // (long class name warning)
+# ifdef __INTEL_COMPILER
+#  pragma warning (disable: 1125)
+# endif
+#endif
+
+// If the MSVC debug heap headers were included, disable
+// the macros during the juce include since they conflict.
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma push_macro("calloc")
+#pragma push_macro("free")
+#pragma push_macro("malloc")
+#pragma push_macro("realloc")
+#pragma push_macro("_recalloc")
+#pragma push_macro("_aligned_free")
+#pragma push_macro("_aligned_malloc")
+#pragma push_macro("_aligned_offset_malloc")
+#pragma push_macro("_aligned_realloc")
+#pragma push_macro("_aligned_recalloc")
+#pragma push_macro("_aligned_offset_realloc")
+#pragma push_macro("_aligned_offset_recalloc")
+#pragma push_macro("_aligned_msize")
+#undef calloc
+#undef free
+#undef malloc
+#undef realloc
+#undef _recalloc
+#undef _aligned_free
+#undef _aligned_malloc
+#undef _aligned_offset_malloc
+#undef _aligned_realloc
+#undef _aligned_recalloc
+#undef _aligned_offset_realloc
+#undef _aligned_offset_recalloc
+#undef _aligned_msize
+#endif
+
 namespace beast
 {

-// START_AUTOINCLUDE containers, files, json, logging, maths, memory, misc, network,
-// streams, system, text, threads, time, unit_tests, xml, zip
-#ifndef BEAST_ABSTRACTFIFO_BEASTHEADER
- #include "containers/beast_AbstractFifo.h"
-#endif
-#ifndef BEAST_ARRAY_BEASTHEADER
- #include "containers/beast_Array.h"
-#endif
-#ifndef BEAST_ARRAYALLOCATIONBASE_BEASTHEADER
- #include "containers/beast_ArrayAllocationBase.h"
-#endif
-#ifndef BEAST_DYNAMICOBJECT_BEASTHEADER
- #include "containers/beast_DynamicObject.h"
-#endif
-#ifndef BEAST_ELEMENTCOMPARATOR_BEASTHEADER
- #include "containers/beast_ElementComparator.h"
-#endif
-#ifndef BEAST_HASHMAP_BEASTHEADER
- #include "containers/beast_HashMap.h"
-#endif
-#ifndef BEAST_LINKEDLISTPOINTER_BEASTHEADER
- #include "containers/beast_LinkedListPointer.h"
-#endif
-#ifndef BEAST_NAMEDVALUESET_BEASTHEADER
- #include "containers/beast_NamedValueSet.h"
-#endif
-#ifndef BEAST_OWNEDARRAY_BEASTHEADER
- #include "containers/beast_OwnedArray.h"
-#endif
-#ifndef BEAST_PROPERTYSET_BEASTHEADER
- #include "containers/beast_PropertySet.h"
-#endif
-#ifndef BEAST_REFERENCECOUNTEDARRAY_BEASTHEADER
- #include "containers/beast_ReferenceCountedArray.h"
-#endif
-#ifndef BEAST_SCOPEDVALUESETTER_BEASTHEADER
- #include "containers/beast_ScopedValueSetter.h"
-#endif
-#ifndef BEAST_SORTEDSET_BEASTHEADER
- #include "containers/beast_SortedSet.h"
-#endif
-#ifndef BEAST_SPARSESET_BEASTHEADER
- #include "containers/beast_SparseSet.h"
-#endif
-#ifndef BEAST_VARIANT_BEASTHEADER
- #include "containers/beast_Variant.h"
-#endif
-#ifndef BEAST_DIRECTORYITERATOR_BEASTHEADER
- #include "files/beast_DirectoryIterator.h"
-#endif
-#ifndef BEAST_FILE_BEASTHEADER
- #include "files/beast_File.h"
-#endif
-#ifndef BEAST_FILEINPUTSTREAM_BEASTHEADER
- #include "files/beast_FileInputStream.h"
-#endif
-#ifndef BEAST_FILEOUTPUTSTREAM_BEASTHEADER
- #include "files/beast_FileOutputStream.h"
-#endif
-#ifndef BEAST_FILESEARCHPATH_BEASTHEADER
- #include "files/beast_FileSearchPath.h"
-#endif
-#ifndef BEAST_MEMORYMAPPEDFILE_BEASTHEADER
- #include "files/beast_MemoryMappedFile.h"
-#endif
-#ifndef BEAST_TEMPORARYFILE_BEASTHEADER
- #include "files/beast_TemporaryFile.h"
-#endif
-#ifndef BEAST_JSON_BEASTHEADER
- #include "json/beast_JSON.h"
-#endif
-#ifndef BEAST_FILELOGGER_BEASTHEADER
- #include "logging/beast_FileLogger.h"
-#endif
-#ifndef BEAST_LOGGER_BEASTHEADER
- #include "logging/beast_Logger.h"
-#endif
-#ifndef BEAST_BIGINTEGER_BEASTHEADER
- #include "maths/beast_BigInteger.h"
-#endif
-#ifndef BEAST_EXPRESSION_BEASTHEADER
- #include "maths/beast_Expression.h"
-#endif
-#ifndef BEAST_MATHSFUNCTIONS_BEASTHEADER
- #include "maths/beast_MathsFunctions.h"
-#endif
-#ifndef BEAST_RANDOM_BEASTHEADER
- #include "maths/beast_Random.h"
-#endif
-#ifndef BEAST_RANGE_BEASTHEADER
- #include "maths/beast_Range.h"
-#endif
-#ifndef BEAST_ATOMIC_BEASTHEADER
- #include "memory/beast_Atomic.h"
-#endif
-#ifndef BEAST_BYTEORDER_BEASTHEADER
- #include "memory/beast_ByteOrder.h"
-#endif
-#ifndef BEAST_HEAPBLOCK_BEASTHEADER
- #include "memory/beast_HeapBlock.h"
-#endif
-#ifndef BEAST_LEAKEDOBJECTDETECTOR_BEASTHEADER
- #include "memory/beast_LeakedObjectDetector.h"
-#endif
-#ifndef BEAST_MEMORY_BEASTHEADER
- #include "memory/beast_Memory.h"
-#endif
-#ifndef BEAST_MEMORYBLOCK_BEASTHEADER
- #include "memory/beast_MemoryBlock.h"
-#endif
-#ifndef BEAST_OPTIONALSCOPEDPOINTER_BEASTHEADER
- #include "memory/beast_OptionalScopedPointer.h"
-#endif
-#ifndef BEAST_REFERENCECOUNTEDOBJECT_BEASTHEADER
- #include "memory/beast_ReferenceCountedObject.h"
-#endif
-#ifndef BEAST_SCOPEDPOINTER_BEASTHEADER
- #include "memory/beast_ScopedPointer.h"
-#endif
-#ifndef BEAST_SINGLETON_BEASTHEADER
- #include "memory/beast_Singleton.h"
-#endif
-#ifndef BEAST_WEAKREFERENCE_BEASTHEADER
- #include "memory/beast_WeakReference.h"
-#endif
-#ifndef BEAST_RESULT_BEASTHEADER
- #include "misc/beast_Result.h"
-#endif
-#ifndef BEAST_UUID_BEASTHEADER
- #include "misc/beast_Uuid.h"
-#endif
-#ifndef BEAST_WINDOWSREGISTRY_BEASTHEADER
- #include "misc/beast_WindowsRegistry.h"
-#endif
-#ifndef BEAST_IPADDRESS_BEASTHEADER
- #include "network/beast_IPAddress.h"
-#endif
-#ifndef BEAST_MACADDRESS_BEASTHEADER
- #include "network/beast_MACAddress.h"
-#endif
-#ifndef BEAST_NAMEDPIPE_BEASTHEADER
- #include "network/beast_NamedPipe.h"
-#endif
-#ifndef BEAST_SOCKET_BEASTHEADER
- #include "network/beast_Socket.h"
-#endif
-#ifndef BEAST_URL_BEASTHEADER
- #include "network/beast_URL.h"
-#endif
-#ifndef BEAST_BUFFEREDINPUTSTREAM_BEASTHEADER
- #include "streams/beast_BufferedInputStream.h"
-#endif
-#ifndef BEAST_FILEINPUTSOURCE_BEASTHEADER
- #include "streams/beast_FileInputSource.h"
-#endif
-#ifndef BEAST_INPUTSOURCE_BEASTHEADER
- #include "streams/beast_InputSource.h"
-#endif
-#ifndef BEAST_INPUTSTREAM_BEASTHEADER
- #include "streams/beast_InputStream.h"
-#endif
-#ifndef BEAST_MEMORYINPUTSTREAM_BEASTHEADER
- #include "streams/beast_MemoryInputStream.h"
-#endif
-#ifndef BEAST_MEMORYOUTPUTSTREAM_BEASTHEADER
- #include "streams/beast_MemoryOutputStream.h"
-#endif
-#ifndef BEAST_OUTPUTSTREAM_BEASTHEADER
- #include "streams/beast_OutputStream.h"
-#endif
-#ifndef BEAST_SUBREGIONSTREAM_BEASTHEADER
- #include "streams/beast_SubregionStream.h"
-#endif
-#ifndef BEAST_PLATFORMDEFS_BEASTHEADER
- #include "system/beast_PlatformDefs.h"
-#endif
-#ifndef BEAST_STANDARDHEADER_BEASTHEADER
- #include "system/beast_StandardHeader.h"
-#endif
-#ifndef BEAST_SYSTEMSTATS_BEASTHEADER
- #include "system/beast_SystemStats.h"
-#endif
-#ifndef BEAST_TARGETPLATFORM_BEASTHEADER
- #include "system/beast_TargetPlatform.h"
-#endif
-#ifndef BEAST_CHARACTERFUNCTIONS_BEASTHEADER
- #include "text/beast_CharacterFunctions.h"
-#endif
-#ifndef BEAST_CHARPOINTER_ASCII_BEASTHEADER
- #include "text/beast_CharPointer_ASCII.h"
-#endif
-#ifndef BEAST_CHARPOINTER_UTF16_BEASTHEADER
- #include "text/beast_CharPointer_UTF16.h"
-#endif
-#ifndef BEAST_CHARPOINTER_UTF32_BEASTHEADER
- #include "text/beast_CharPointer_UTF32.h"
-#endif
-#ifndef BEAST_CHARPOINTER_UTF8_BEASTHEADER
- #include "text/beast_CharPointer_UTF8.h"
-#endif
-#ifndef BEAST_IDENTIFIER_BEASTHEADER
- #include "text/beast_Identifier.h"
-#endif
-#ifndef BEAST_LOCALISEDSTRINGS_BEASTHEADER
- #include "text/beast_LocalisedStrings.h"
-#endif
-#ifndef BEAST_NEWLINE_BEASTHEADER
- #include "text/beast_NewLine.h"
-#endif
-#ifndef BEAST_STRING_BEASTHEADER
- #include "text/beast_String.h"
-#endif
-#ifndef BEAST_STRINGARRAY_BEASTHEADER
- #include "text/beast_StringArray.h"
-#endif
-#ifndef BEAST_STRINGPAIRARRAY_BEASTHEADER
- #include "text/beast_StringPairArray.h"
-#endif
-#ifndef BEAST_STRINGPOOL_BEASTHEADER
- #include "text/beast_StringPool.h"
-#endif
-#ifndef BEAST_TEXTDIFF_BEASTHEADER
- #include "text/beast_TextDiff.h"
-#endif
-#ifndef BEAST_CHILDPROCESS_BEASTHEADER
- #include "threads/beast_ChildProcess.h"
-#endif
-#ifndef BEAST_CRITICALSECTION_BEASTHEADER
- #include "threads/beast_CriticalSection.h"
-#endif
-#ifndef BEAST_DYNAMICLIBRARY_BEASTHEADER
- #include "threads/beast_DynamicLibrary.h"
-#endif
-#ifndef BEAST_HIGHRESOLUTIONTIMER_BEASTHEADER
- #include "threads/beast_HighResolutionTimer.h"
-#endif
-#ifndef BEAST_INTERPROCESSLOCK_BEASTHEADER
- #include "threads/beast_InterProcessLock.h"
-#endif
-#ifndef BEAST_PROCESS_BEASTHEADER
- #include "threads/beast_Process.h"
-#endif
-#ifndef BEAST_READWRITELOCK_BEASTHEADER
- #include "threads/beast_ReadWriteLock.h"
-#endif
-#ifndef BEAST_SCOPEDLOCK_BEASTHEADER
- #include "threads/beast_ScopedLock.h"
-#endif
-#ifndef BEAST_SCOPEDREADLOCK_BEASTHEADER
- #include "threads/beast_ScopedReadLock.h"
-#endif
-#ifndef BEAST_SCOPEDWRITELOCK_BEASTHEADER
- #include "threads/beast_ScopedWriteLock.h"
-#endif
-#ifndef BEAST_SPINLOCK_BEASTHEADER
- #include "threads/beast_SpinLock.h"
-#endif
-#ifndef BEAST_THREAD_BEASTHEADER
- #include "threads/beast_Thread.h"
-#endif
-#ifndef BEAST_THREADLOCALVALUE_BEASTHEADER
- #include "threads/beast_ThreadLocalValue.h"
-#endif
-#ifndef BEAST_THREADPOOL_BEASTHEADER
- #include "threads/beast_ThreadPool.h"
-#endif
-#ifndef BEAST_TIMESLICETHREAD_BEASTHEADER
- #include "threads/beast_TimeSliceThread.h"
-#endif
-#ifndef BEAST_WAITABLEEVENT_BEASTHEADER
- #include "threads/beast_WaitableEvent.h"
-#endif
-#ifndef BEAST_PERFORMANCECOUNTER_BEASTHEADER
- #include "time/beast_PerformanceCounter.h"
-#endif
-#ifndef BEAST_RELATIVETIME_BEASTHEADER
- #include "time/beast_RelativeTime.h"
-#endif
-#ifndef BEAST_TIME_BEASTHEADER
- #include "time/beast_Time.h"
-#endif
-#ifndef BEAST_UNITTEST_BEASTHEADER
- #include "unit_tests/beast_UnitTest.h"
-#endif
-#ifndef BEAST_XMLDOCUMENT_BEASTHEADER
- #include "xml/beast_XmlDocument.h"
-#endif
-#ifndef BEAST_XMLELEMENT_BEASTHEADER
- #include "xml/beast_XmlElement.h"
-#endif
-#ifndef BEAST_GZIPCOMPRESSOROUTPUTSTREAM_BEASTHEADER
- #include "zip/beast_GZIPCompressorOutputStream.h"
-#endif
-#ifndef BEAST_GZIPDECOMPRESSORINPUTSTREAM_BEASTHEADER
- #include "zip/beast_GZIPDecompressorInputStream.h"
-#endif
-#ifndef BEAST_ZIPFILE_BEASTHEADER
- #include "zip/beast_ZipFile.h"
-#endif
-// END_AUTOINCLUDE
+// Order matters, since headers don't have their own #include lines.
+// Add new includes to the bottom.
+
+#include "memory/beast_Uncopyable.h"
+#include "maths/beast_MathsFunctions.h"
+#include "memory/beast_Atomic.h"
+#include "memory/beast_AtomicCounter.h"
+#include "memory/beast_AtomicFlag.h"
+#include "memory/beast_AtomicPointer.h"
+#include "memory/beast_AtomicState.h"
+#include "containers/beast_LockFreeStack.h"
+#include "threads/beast_SpinDelay.h"
+#include "memory/beast_StaticObject.h"
+#include "time/beast_PerformedAtExit.h"
+#include "diagnostic/beast_LeakChecked.h"
+#include "memory/beast_Memory.h"
+#include "memory/beast_ByteOrder.h"
+#include "logging/beast_Logger.h"
+#include "threads/beast_Thread.h"
+#include "diagnostic/beast_Debug.h"
+#include "diagnostic/beast_SafeBool.h"
+#include "diagnostic/beast_Error.h"
+#include "diagnostic/beast_FPUFlags.h"
+#include "diagnostic/beast_Throw.h"
+#include "containers/beast_AbstractFifo.h"
+#include "containers/beast_Array.h"
+#include "containers/beast_ArrayAllocationBase.h"
+#include "containers/beast_DynamicObject.h"
+#include "containers/beast_ElementComparator.h"
+#include "containers/beast_HashMap.h"
+#include "containers/beast_List.h"
+#include "containers/beast_LinkedListPointer.h"
+#include "containers/beast_LockFreeQueue.h"
+#include "containers/beast_NamedValueSet.h"
+#include "containers/beast_OwnedArray.h"
+#include "containers/beast_PropertySet.h"
+#include "containers/beast_ReferenceCountedArray.h"
+#include "containers/beast_ScopedValueSetter.h"
+#include "containers/beast_SharedTable.h"
+#include "containers/beast_SortedLookupTable.h"
+#include "containers/beast_SortedSet.h"
+#include "containers/beast_SparseSet.h"
+#include "containers/beast_Variant.h"
+#include "files/beast_DirectoryIterator.h"
+#include "files/beast_File.h"
+#include "files/beast_FileInputStream.h"
+#include "files/beast_FileOutputStream.h"
+#include "files/beast_FileSearchPath.h"
+#include "files/beast_MemoryMappedFile.h"
+#include "files/beast_TemporaryFile.h"
+#include "json/beast_JSON.h"
+#include "logging/beast_FileLogger.h"
+#include "logging/beast_Logger.h"
+#include "maths/beast_BigInteger.h"
+#include "maths/beast_Expression.h"
+#include "maths/beast_Interval.h"
+#include "maths/beast_MathsFunctions.h"
+#include "maths/beast_Random.h"
+#include "maths/beast_Range.h"
+#include "memory/beast_ByteOrder.h"
+#include "memory/beast_HeapBlock.h"
+#include "memory/beast_Memory.h"
+#include "memory/beast_MemoryBlock.h"
+#include "memory/beast_OptionalScopedPointer.h"
+#include "memory/beast_ReferenceCountedObject.h"
+#include "memory/beast_ScopedPointer.h"
+#include "threads/beast_SpinLock.h"
+#include "memory/beast_SharedSingleton.h"
+#include "memory/beast_WeakReference.h"
+#include "memory/beast_MemoryAlignment.h"
+#include "memory/beast_CacheLine.h"
+#include "misc/beast_Result.h"
+#include "misc/beast_Uuid.h"
+#include "misc/beast_WindowsRegistry.h"
+#include "network/beast_IPAddress.h"
+#include "network/beast_MACAddress.h"
+#include "network/beast_NamedPipe.h"
+#include "network/beast_Socket.h"
+#include "network/beast_URL.h"
+#include "streams/beast_BufferedInputStream.h"
+#include "streams/beast_FileInputSource.h"
+#include "streams/beast_InputSource.h"
+#include "streams/beast_InputStream.h"
+#include "streams/beast_MemoryInputStream.h"
+#include "streams/beast_MemoryOutputStream.h"
+#include "streams/beast_OutputStream.h"
+#include "streams/beast_SubregionStream.h"
+#include "system/beast_Functional.h"
+#include "system/beast_PlatformDefs.h"
+#include "system/beast_StandardHeader.h"
+#include "system/beast_SystemStats.h"
+#include "system/beast_TargetPlatform.h"
+#include "text/beast_CharacterFunctions.h"
+#include "text/beast_CharPointer_ASCII.h"
+#include "text/beast_CharPointer_UTF16.h"
+#include "text/beast_CharPointer_UTF32.h"
+#include "text/beast_CharPointer_UTF8.h"
+#include "text/beast_Identifier.h"
+#include "text/beast_LocalisedStrings.h"
+#include "text/beast_NewLine.h"
+#include "text/beast_String.h"
+#include "text/beast_StringArray.h"
+#include "text/beast_StringPairArray.h"
+#include "text/beast_StringPool.h"
+#include "text/beast_TextDiff.h"
+#include "threads/beast_ChildProcess.h"
+#include "threads/beast_CriticalSection.h"
+#include "threads/beast_DynamicLibrary.h"
+#include "threads/beast_HighResolutionTimer.h"
+#include "threads/beast_InterProcessLock.h"
+#include "threads/beast_Process.h"
+#include "threads/beast_ReadWriteLock.h"
+#include "threads/beast_ScopedLock.h"
+#include "threads/beast_ScopedReadLock.h"
+#include "threads/beast_ScopedWriteLock.h"
+#include "threads/beast_ThreadLocalValue.h"
+#include "threads/beast_ThreadPool.h"
+#include "threads/beast_TimeSliceThread.h"
+#include "threads/beast_WaitableEvent.h"
+#include "time/beast_PerformanceCounter.h"
+#include "time/beast_RelativeTime.h"
+#include "time/beast_Time.h"
+#include "unit_tests/beast_UnitTest.h"
+#include "xml/beast_XmlDocument.h"
+#include "xml/beast_XmlElement.h"
+#include "zip/beast_GZIPCompressorOutputStream.h"
+#include "zip/beast_GZIPDecompressorInputStream.h"
+#include "zip/beast_ZipFile.h"

 }

-#if BEAST_MSVC
- #pragma warning (pop)
+#ifdef _CRTDBG_MAP_ALLOC
+#pragma pop_macro("_aligned_msize")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("malloc")
+#pragma pop_macro("free")
+#pragma pop_macro("calloc")
 #endif

-#endif   // BEAST_CORE_BEASTHEADER
+#if BEAST_MSVC
+#pragma warning (pop)
+#endif
+
+//------------------------------------------------------------------------------
+
+#endif
--- a/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.h
@@ -24,21 +24,19 @@
 #ifndef BEAST_ABSTRACTFIFO_BEASTHEADER
 #define BEAST_ABSTRACTFIFO_BEASTHEADER

-#include "../memory/beast_Atomic.h"
-
-
 //==============================================================================
 /**
    Encapsulates the logic required to implement a lock-free FIFO.

-    This class handles the logic needed when building a single-reader, single-writer FIFO.
+    This class handles the logic needed when building a single-reader,
+    single-writer FIFO.

-    It doesn't actually hold any data itself, but your FIFO class can use one of these to manage
-    its position and status when reading or writing to it.
+    It doesn't actually hold any data itself, but your FIFO class can use one of
+    these to manage its position and status when reading or writing to it.

-    To use it, you can call prepareToWrite() to determine the position within your own buffer that
-    an incoming block of data should be stored, and prepareToRead() to find out when the next
-    outgoing block should be read from.
+    To use it, you can call prepareToWrite() to determine the position within
+    your own buffer that an incoming block of data should be stored, and
+    prepareToRead() to find out when the next outgoing block should be read from.

    e.g.
    @code
@@ -83,7 +81,7 @@
    };
    @endcode
 */
-class BEAST_API AbstractFifo
+class BEAST_API AbstractFifo : LeakChecked <AbstractFifo>, Uncopyable
 {
 public:
    //==============================================================================
@@ -204,14 +202,11 @@ public:
    */
    void finishedRead (int numRead) noexcept;

-
 private:
    //==============================================================================
    int bufferSize;
    Atomic <int> validStart, validEnd;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AbstractFifo)
 };

+#endif

-#endif   // BEAST_ABSTRACTFIFO_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/containers/beast_Array.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_Array.h
@@ -230,8 +230,14 @@ public:
    ElementType operator[] (const int index) const
    {
        const ScopedLockType lock (getLock());
-        return isPositiveAndBelow (index, numUsed) ? data.elements [index]
-                                                   : ElementType();
+
+        if (isPositiveAndBelow (index, numUsed))
+        {
+            bassert (data.elements != nullptr);
+            return data.elements [index];
+        }
+
+        return ElementType();
    }

    /** Returns one of the elements in the array, without checking the index passed in.
@@ -246,7 +252,7 @@ public:
    inline ElementType getUnchecked (const int index) const
    {
        const ScopedLockType lock (getLock());
-        bassert (isPositiveAndBelow (index, numUsed));
+        bassert (isPositiveAndBelow (index, numUsed) && data.elements != nullptr);
        return data.elements [index];
    }

@@ -262,7 +268,7 @@ public:
    inline ElementType& getReference (const int index) const noexcept
    {
        const ScopedLockType lock (getLock());
-        bassert (isPositiveAndBelow (index, numUsed));
+        bassert (isPositiveAndBelow (index, numUsed) && data.elements != nullptr);
        return data.elements [index];
    }

@@ -383,6 +389,7 @@ public:
    {
        const ScopedLockType lock (getLock());
        data.ensureAllocatedSize (numUsed + 1);
+        bassert (data.elements != nullptr);

        if (isPositiveAndBelow (indexToInsertAt, numUsed))
        {
@@ -716,6 +723,7 @@ public:

        if (isPositiveAndBelow (indexToRemove, numUsed))
        {
+            bassert (data.elements != nullptr); 
            ElementType removed (data.elements[indexToRemove]);
            removeInternal (indexToRemove);
            return removed;
@@ -1043,5 +1051,4 @@ private:
    }
 };

-
 #endif   // BEAST_ARRAY_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/containers/beast_ArrayAllocationBase.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_ArrayAllocationBase.h
@@ -40,7 +40,8 @@
    @see Array, OwnedArray, ReferenceCountedArray
 */
 template <class ElementType, class TypeOfCriticalSectionToUse>
-class ArrayAllocationBase  : public TypeOfCriticalSectionToUse
+class ArrayAllocationBase
+    : public TypeOfCriticalSectionToUse
 {
 public:
    //==============================================================================
@@ -103,6 +104,8 @@ public:
    {
        if (minNumElements > numAllocated)
            setAllocatedSize ((minNumElements + minNumElements / 2 + 8) & ~7);
+
+        bassert (numAllocated <= 0 || elements != nullptr);
    }

    /** Minimises the amount of storage allocated so that it's no more than
@@ -124,10 +127,6 @@ public:
    //==============================================================================
    HeapBlock <ElementType> elements;
    int numAllocated;
-
-private:
-    BEAST_DECLARE_NON_COPYABLE (ArrayAllocationBase)
 };

-
 #endif   // BEAST_ARRAYALLOCATIONBASE_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/containers/beast_DynamicObject.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_DynamicObject.h
@@ -39,7 +39,9 @@
    by subclassing hasMethod() and invokeMethod(), you can give your object
    methods.
 */
-class BEAST_API DynamicObject  : public ReferenceCountedObject
+class BEAST_API DynamicObject
+    : public ReferenceCountedObject
+    , LeakChecked <DynamicObject>
 {
 public:
    //==============================================================================
@@ -112,8 +114,6 @@ public:
 private:
    //==============================================================================
    NamedValueSet properties;
-
-    BEAST_LEAK_DETECTOR (DynamicObject)
 };


--- a/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_HashMap.h
@@ -95,6 +95,11 @@ template <typename KeyType,
          class HashFunctionToUse = DefaultHashFunctions,
          class TypeOfCriticalSectionToUse = DummyCriticalSection>
 class HashMap
+    : Uncopyable
+    , LeakChecked <HashMap <KeyType,
+                            ValueType,
+                            HashFunctionToUse,
+                            TypeOfCriticalSectionToUse> >
 {
 private:
    typedef PARAMETER_TYPE (KeyType)   KeyTypeParameter;
@@ -333,7 +338,7 @@ public:

 private:
    //==============================================================================
-    class HashEntry
+    class HashEntry : Uncopyable
    {
    public:
        HashEntry (KeyTypeParameter k, ValueTypeParameter val, HashEntry* const next)
@@ -343,8 +348,6 @@ private:
        const KeyType key;
        ValueType value;
        HashEntry* nextEntry;
-
-        BEAST_DECLARE_NON_COPYABLE (HashEntry)
    };

 public:
@@ -371,7 +374,7 @@ public:

        @see HashMap
    */
-    class Iterator
+    class Iterator : LeakChecked <Iterator>, Uncopyable
    {
    public:
        //==============================================================================
@@ -420,8 +423,6 @@ public:
        const HashMap& hashMap;
        HashEntry* entry;
        int index;
-
-        BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Iterator)
    };

 private:
@@ -439,8 +440,6 @@ private:
        bassert (isPositiveAndBelow (hash, getNumSlots())); // your hash function is generating out-of-range numbers!
        return hash;
    }
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HashMap)
 };


--- a/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_LinkedListPointer.h
@@ -53,7 +53,7 @@
    @endcode
 */
 template <class ObjectType>
-class LinkedListPointer
+class LinkedListPointer : Uncopyable
 {
 public:
    //==============================================================================
@@ -330,7 +330,7 @@ public:
        list, and then repeatedly call Appender::append() to add items to the end
        of the list in O(1) time.
    */
-    class Appender
+    class Appender : Uncopyable
    {
    public:
        /** Creates an appender which will add items to the given list.
@@ -351,15 +351,11 @@ public:

    private:
        LinkedListPointer* endOfList;
-
-        BEAST_DECLARE_NON_COPYABLE (Appender)
    };

 private:
    //==============================================================================
    ObjectType* item;
-
-    BEAST_DECLARE_NON_COPYABLE (LinkedListPointer)
 };


--- a/Subtrees/beast/modules/beast_basics/containers/beast_List.h
+++ b/Subtrees/beast/modules/beast_basics/containers/beast_List.h
@@ -17,289 +17,291 @@
 */
 //==============================================================================

-#ifndef BEAST_LIST_BEASTHEADER
-#define BEAST_LIST_BEASTHEADER
+#ifndef BEAST_LIST_H_INCLUDED
+#define BEAST_LIST_H_INCLUDED

-struct ListDefaultTag;
+/** Intrusive Containers

-/*============================================================================*/
-/**
-  Intrusive Containers
+    # Introduction

-  # Introduction
+    Intrusive containers are special containers that offer better performance
+    and exception safety guarantees than non-intrusive containers (like the
+    STL containers). They are useful building blocks for high performance
+    concurrent systems or other purposes where allocations are restricted
+    (such as the AudioIODeviceCallback object), because intrusive list
+    operations do not allocate or free memory.

-  Intrusive containers are special containers that offer better performance
-  and exception safety guarantees than non-intrusive containers (like the
-  STL containers). They are useful building blocks for high performance
-  concurrent systems or other purposes where allocations are restricted
-  (such as the AudioIODeviceCallback object), because intrusive list
-  operations do not allocate or free memory.
+    While intrusive containers were and are widely used in C, they became more
+    and more forgotten in C++ due to the presence of the standard containers
+    which don't support intrusive techniques. VFLib not only reintroduces this
+    technique to C++ for lists, it also encapsulates the implementation in a
+    mostly compliant STL interface. Hence anyone familiar with standard
+    containers can easily use them.

-  While intrusive containers were and are widely used in C, they became more
-  and more forgotten in C++ due to the presence of the standard containers
-  which don't support intrusive techniques. VFLib not only reintroduces this
-  technique to C++ for lists, it also encapsulates the implementation in a
-  mostly compliant STL interface. Hence anyone familiar with standard
-  containers can easily use them.
+    # Interface

-  # Interface
+    The interface for intrusive elements in this library is unified for all
+    containers. Unlike STL containers, objects placed into intrusive containers
+    are not copied. Instead, a pointer to the object is stored. All
+    responsibility for object lifetime is the responsibility of the caller;
+    the intrusive container just keeps track of what is in it.

-  The interface for intrusive elements in this library is unified for all
-  containers. Unlike STL containers, objects placed into intrusive containers
-  are not copied. Instead, a pointer to the object is stored. All
-  responsibility for object lifetime is the responsibility of the caller;
-  the intrusive container just keeps track of what is in it.
+    Summary of intrusive container differences:

-  Summary of intrusive container differences:
+    - Holds pointers to existing objects instead of copies.

-  - Holds pointers to existing objects instead of copies.
+    - Does not allocate or free any objects.

-  - Does not allocate or free any objects.
+    - Requires a element's class declaration to be modified.

-  - Requires a element's class declaration to be modified.
+    - Methods never throw exceptions when called with valid arguments.

-  - Methods never throw exceptions when called with valid arguments.
+    # Usage

-  # Usage
+    Like STL containers, intrusive containers are all template based, where the
+    template argument specifies the type of object that the container will hold.
+    These declarations specify a doubly linked list where each element points
+    to a user defined class:

-  Like STL containers, intrusive containers are all template based, where the
-  template argument specifies the type of object that the container will hold.
-  These declarations specify a doubly linked list where each element points
-  to a user defined class:
+    @code

-  @code
+    struct Object; // Forward declaration

-  class Object; // Forward declaration
+    List <Object> list; // Doubly-linked list of Object

-  List <Object> list; // Doubly-linked list of Object
+    @endcode

-  @endcode
+    Because intrusive containers allocate no memory, allowing objects to be
+    placed inside requires a modification to their class declaration. Each
+    intrusive container declares a nested class `Node` which elements must be
+    derived from, using the Curiously Recurring Template Pattern (CRTP). We
+    will continue to fully declare the Object type from the previous example
+    to support emplacement into an intrusive container:

-  Because intrusive containers allocate no memory, allowing objects to be
-  placed inside requires a modification to their class declaration. Each
-  intrusive container declares a nested class `Node` which elements must be
-  derived from, using the Curiously Recurring Template Pattern (CRTP). We
-  will continue to fully declare the Object type from the previous example
-  to support emplacement into an intrusive container:
+    @code

-  @code
+    struct Object : public List <Object>::Node // Required for List
+    {
+        void performAction ();
+    };

-  class Object : public List <Object>::Node // Required for List
-  {
-  public:
-    void performAction ();
-  };
+    @endcode

-  @endcode
+    Usage of a typedef eliminates redundant specification of the template
+    arguments but requires a forward declaration. The following code is
+    equivalent.

-  Usage of a typedef eliminates redundant specification of the template
-  arguments but requires a forward declaration. The following code is
-  equivalent.
+    @code

-  @code
+    struct Object; // Forward declaration

-  class Object; // Forward declaration
+    // Specify template parameters just once
+    typedef List <Object> ListType;

-  // Specify template parameters just once
-  typedef List <Object> ListType;
+    struct Object : public ListType::Node
+    {
+        void performAction ();
+    };

-  class Object : public ListType::Node
-  {
-    void performAction ();
-  };
+    ListType::Node list;

-  ListType::Node list;
+    @endcode

-  @endcode
+    With these declarations we may proceed to create our objects, add them to
+    the list, and perform operations:

-  With these declarations we may proceed to create our objects, add them to
-  the list, and perform operations:
+    @code

-  @code
+    // Create a few objects and put them in the list
+    for (i = 0; i < 5; ++i)
+        list.push_back (*new Object);

-  // Create a few objects and put them in the list
-  for (i = 0; i < 5; ++i)
-    list.push_back (*new Object);
+    // Call a method on each list
+    for (ListType::iterator iter = list.begin(); iter != list.end (); ++iter)
+        iter->performAction ();

-  // Call a method on each list
-  for (ListType::iterator iter = list.begin(); iter != list.end (); ++iter)
-    iter->performAction ();
+    @endcode

-  @endcode
+    Unlike regular STL containers, an object derived from an intrusive container
+    node cannot exist in more than one instance of that list at a time. This is
+    because the bookkeeping information for maintaining the list is kept in
+    the object rather than the list.

-  Unlike regular STL containers, an object derived from an intrusive container
-  node cannot exist in more than one instance of that list at a time. This is
-  because the bookkeeping information for maintaining the list is kept in
-  the object rather than the list.
+    To support objects existing in multiple containers, templates variations
+    are instantiated by distinguishing them with an empty structure, called a
+    tag. The object is derived from multiple instances of Node, where each
+    instance specifies a unique tag. The tag is passed as the second template
+    argument. When the second argument is unspecified, the default tag is used.

-  To support objects existing in multiple containers, templates variations
-  are instantiated by distinguishing them with an empty structure, called a
-  tag. The object is derived from multiple instances of Node, where each
-  instance specifies a unique tag. The tag is passed as the second template
-  argument. When the second argument is unspecified, the default tag is used.
+    This declaration example shows the usage of tags to allow an object to exist
+    simultaneously in two separate lists:

-  This declaration example shows the usage of tags to allow an object to exist
-  simultaneously in two separate lists:
+    @code

-  @code
+    struct GlobalListTag { }; // list of all objects
+    struct ActiveListTag { }; // subset of all objects that are active

-  struct GlobalListTag { }; // list of all objects
-  struct ActiveListTag { }; // subset of all objects that are active
-
-  class Object : public List <Object, GlobalListTag>
-               , public List <Object, ActiveListTag>
-  {
-  public:
+    class Object : public List <Object, GlobalListTag>
+                , public List <Object, ActiveListTag>
+    {
+    public:
    Object () : m_isActive (false)
    {
-      // Add ourselves to the global list
-      s_globalList.push_front (*this);
+        // Add ourselves to the global list
+        s_globalList.push_front (*this);
    }

    ~Object ()
    {
-      deactivate ();
+        deactivate ();
    }

    void becomeActive ()
    {
-      // Add ourselves to the active list
-      if (!m_isActive)
-      {
-        s_activeList.push_front (*this);
-        m_isActive = true;
-      }
+        // Add ourselves to the active list
+        if (!m_isActive)
+        {
+            s_activeList.push_front (*this);
+            m_isActive = true;
+        }
    }

    void deactivate ()
    {
-      if (m_isActive)
-      {
-        // Doesn't delete the object
-        s_activeList.erase (s_activeList.iterator_to (this));
+        if (m_isActive)
+        {
+            // Doesn't delete the object
+            s_activeList.erase (s_activeList.iterator_to (this));

-        m_isActive = false;
-      }
+            m_isActive = false;
+        }
    }

-  private:
-    bool m_isActive;
+    private:
+        bool m_isActive;

-    static List <Object, GlobalListTag> s_globalList;
-    static List <Object, ActiveListTag> s_activeList;
-  }
+        static List <Object, GlobalListTag> s_globalList;
+        static List <Object, ActiveListTag> s_activeList;
+    }

-  @endcode
+    @endcode

-  @defgroup intrusive intrusive
-  @ingroup beast_core
+    @defgroup intrusive intrusive
+    @ingroup beast_core
 */

-/*============================================================================*/
+//------------------------------------------------------------------------------
+
+/** Default tag for List.
+
+    @ingroup beast_core intrusive
+*/
+struct ListDefaultTag;
+
 /**
-  Intrusive doubly linked list.
-
-  This intrusive List is a container similar in operation to std::list in the
-  Standard Template Library (STL). Like all @ref intrusive containers, List
-  requires you to first derive your class from List<>::Node:
-
-  @code
-
-  struct Object : List <Object>::Node
-  {
-    Object (int value) : m_value (value)
+    Intrusive doubly linked list.
+  
+    This intrusive List is a container similar in operation to std::list in the
+    Standard Template Library (STL). Like all @ref intrusive containers, List
+    requires you to first derive your class from List<>::Node:
+  
+    @code
+  
+    struct Object : List <Object>::Node
    {
-    }
-
-    int m_value;
-  };
-
-  @endcode
-
-  Now we define the list, and add a couple of items.
-
-  @code
-
-  List <Object> list;
-
-  list.push_back (* (new Object (1)));
-  list.push_back (* (new Object (2)));
-
-  @endcode
-
-  For compatibility with the standard containers, push_back() expects a
-  reference to the object. Unlike the standard container, however, push_back()
-  places the actual object in the list and not a copy-constructed duplicate.
-
-  Iterating over the list follows the same idiom as the STL:
-
-  @code
-
-  for (List <Object>::iterator iter = list.begin(); iter != list.end; ++iter)
-    std::cout << iter->m_value;
-
-  @endcode
-
-  You can even use BOOST_FOREACH, or range based for loops:
-
-  @code
-
-  BOOST_FOREACH (Object& object, list)  // boost only
-    std::cout << object.m_value;
-
-  for (Object& object : list)           // C++11 only
-    std::cout << object.m_value;
-
-  @endcode
-
-  Because List is mostly STL compliant, it can be passed into STL algorithms:
-  e.g. `std::for_each()` or `std::find_first_of()`.
-
-  In general, objects placed into a List should be dynamically allocated
-  although this cannot be enforced at compile time. Since the caller provides
-  the storage for the object, the caller is also responsible for deleting the
-  object. An object still exists after being removed from a List, until the
-  caller deletes it. This means an element can be moved from one List to
-  another with practically no overhead.
-
-  Unlike the standard containers, an object may only exist in one list at a
-  time, unless special preparations are made. The Tag template parameter is
-  used to distinguish between different list types for the same object,
-  allowing the object to exist in more than one list simultaneously.
-
-  For example, consider an actor system where a global list of actors is
-  maintained, so that they can each be periodically receive processing
-  time. We wish to also maintain a list of the subset of actors that require
-  a domain-dependent update. To achieve this, we declare two tags, the
-  associated list types, and the list element thusly:
-
-  @code
-
-  struct Actor;         // Forward declaration required
-
-  struct ProcessTag { };
-  struct UpdateTag { };
-
-  typedef List <Actor, ProcessTag> ProcessList;
-  typedef List <Actor, UpdateTag> UpdateList;
-
-  // Derive from both node types so we can be in each list at once.
-  //
-  struct Actor : ProcessList::Node, UpdateList::Node
-  {
-    bool process ();    // returns true if we need an update
-    void update ();
-  };
-
-  @endcode
-
-  @tparam Element The base type of element which the list will store
-                  pointers to.
-
-  @tparam Tag An optional unique type name used to distinguish lists and nodes,
-              when the object can exist in multiple lists simultaneously.
-
-  @ingroup beast_core intrusive
+        explicit Object (int value) : m_value (value)
+        {
+        }
+  
+        int m_value;
+    };
+  
+    @endcode
+  
+    Now we define the list, and add a couple of items.
+  
+    @code
+  
+    List <Object> list;
+  
+    list.push_back (* (new Object (1)));
+    list.push_back (* (new Object (2)));
+  
+    @endcode
+  
+    For compatibility with the standard containers, push_back() expects a
+    reference to the object. Unlike the standard container, however, push_back()
+    places the actual object in the list and not a copy-constructed duplicate.
+  
+    Iterating over the list follows the same idiom as the STL:
+  
+    @code
+  
+    for (List <Object>::iterator iter = list.begin(); iter != list.end; ++iter)
+        std::cout << iter->m_value;
+  
+    @endcode
+  
+    You can even use BOOST_FOREACH, or range based for loops:
+  
+    @code
+  
+    BOOST_FOREACH (Object& object, list)  // boost only
+        std::cout << object.m_value;
+  
+    for (Object& object : list)           // C++11 only
+        std::cout << object.m_value;
+  
+    @endcode
+  
+    Because List is mostly STL compliant, it can be passed into STL algorithms:
+    e.g. `std::for_each()` or `std::find_first_of()`.
+  
+    In general, objects placed into a List should be dynamically allocated
+    although this cannot be enforced at compile time. Since the caller provides
+    the storage for the object, the caller is also responsible for deleting the
+    object. An object still exists after being removed from a List, until the
+    caller deletes it. This means an element can be moved from one List to
+    another with practically no overhead.
+  
+    Unlike the standard containers, an object may only exist in one list at a
+    time, unless special preparations are made. The Tag template parameter is
+    used to distinguish between different list types for the same object,
+    allowing the object to exist in more than one list simultaneously.
+  
+    For example, consider an actor system where a global list of actors is
+    maintained, so that they can each be periodically receive processing
+    time. We wish to also maintain a list of the subset of actors that require
+    a domain-dependent update. To achieve this, we declare two tags, the
+    associated list types, and the list element thusly:
+  
+    @code
+  
+    struct Actor;         // Forward declaration required
+  
+    struct ProcessTag { };
+    struct UpdateTag { };
+  
+    typedef List <Actor, ProcessTag> ProcessList;
+    typedef List <Actor, UpdateTag> UpdateList;
+  
+    // Derive from both node types so we can be in each list at once.
+    //
+    struct Actor : ProcessList::Node, UpdateList::Node
+    {
+        bool process ();    // returns true if we need an update
+        void update ();
+    };
+  
+    @endcode
+  
+    @tparam Element The base type of element which the list will store
+                    pointers to.
+  
+    @tparam Tag An optional unique type name used to distinguish lists and nodes,
+                when the object can exist in multiple lists simultaneously.
+  
+    @ingroup beast_core intrusive
 */
 template <class Element, class Tag = ListDefaultTag>
 class List : Uncopyable
@@ -786,11 +788,4 @@ private:
    Node m_tail;
 };

-/**
-  Default tag for List.
-
-  @ingroup beast_core intrusive
-*/
-struct ListDefaultTag { };
-
 #endif
--- a/Subtrees/beast/modules/beast_basics/containers/beast_LockFreeQueue.h
+++ b/Subtrees/beast/modules/beast_basics/containers/beast_LockFreeQueue.h
@@ -20,33 +20,31 @@
 #ifndef BEAST_LOCKFREEQUEUE_BEASTHEADER
 #define BEAST_LOCKFREEQUEUE_BEASTHEADER

-#include "../memory/beast_CacheLine.h"
-#include "../memory/beast_AtomicPointer.h"
-#include "../threads/beast_SpinDelay.h"
+/** Default tag for LockFreeQueue

-struct LockFreeQueueDefaultTag;
+    @ingroup beast_core intrusive
+*/
+struct LockFreeQueueDefaultTag { };

-/*============================================================================*/
-/**
-  Multiple Producer, Single Consumer (MPSC) intrusive FIFO.
+/** Multiple Producer, Single Consumer (MPSC) intrusive FIFO.

-  This container uses the same intrusive interface as List. It is wait-free
-  for producers and lock-free for consumers. The caller is responsible for
-  preventing the ABA problem (http://en.wikipedia.org/wiki/ABA_problem)
+    This container uses the same intrusive interface as List. It is wait-free
+    for producers and lock-free for consumers. The caller is responsible for
+    preventing the ABA problem (http://en.wikipedia.org/wiki/ABA_problem)

-  Invariants:
+    Invariants:

-  - Any thread may call push_back() at any time (Multiple Producer).
+    - Any thread may call push_back() at any time (Multiple Producer).

-  - Only one thread may call try_pop_front() at a time (Single Consumer)
+    - Only one thread may call try_pop_front() at a time (Single Consumer)

-  - The queue is signaled if there are one or more elements.
+    - The queue is signaled if there are one or more elements.

-  @param Tag  A type name used to distinguish lists and nodes, for
-              putting objects in multiple lists. If this parameter is
-              omitted, the default tag is used.
+    @param Tag  A type name used to distinguish lists and nodes, for
+                putting objects in multiple lists. If this parameter is
+                omitted, the default tag is used.

-  @ingroup beast_core intrusive
+    @ingroup beast_core intrusive
 */
 template <class Element, class Tag = LockFreeQueueDefaultTag>
 class LockFreeQueue
@@ -216,11 +214,4 @@ private:
    Node m_null;
 };

-/*============================================================================*/
-/** Default tag for LockFreeQueue
-
-    @ingroup beast_core intrusive
-*/
-struct LockFreeQueueDefaultTag { };
-
 #endif
--- a/Subtrees/beast/modules/beast_basics/containers/beast_LockFreeStack.h
+++ b/Subtrees/beast/modules/beast_basics/containers/beast_LockFreeStack.h
@@ -20,8 +20,6 @@
 #ifndef BEAST_LOCKFREESTACK_BEASTHEADER
 #define BEAST_LOCKFREESTACK_BEASTHEADER

-#include "../memory/beast_AtomicPointer.h"
-
 struct LockFreeStackDefaultTag;

 /*============================================================================*/
@@ -58,6 +56,7 @@ public:
    private:
        friend class LockFreeStack;

+        // VFALCO TODO Use regular Atomic<>
        AtomicPointer <Node> m_next;
    };

--- a/Subtrees/beast/modules/beast_core/containers/beast_NamedValueSet.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_NamedValueSet.h
@@ -132,7 +132,7 @@ public:

 private:
    //==============================================================================
-    class NamedValue
+    class NamedValue : LeakChecked <NamedValue>
    {
    public:
        NamedValue() noexcept;
@@ -151,7 +151,6 @@ private:
        var value;

    private:
-        BEAST_LEAK_DETECTOR (NamedValue)
    };

    friend class LinkedListPointer<NamedValue>;
--- a/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_OwnedArray.h
@@ -24,11 +24,6 @@
 #ifndef BEAST_OWNEDARRAY_BEASTHEADER
 #define BEAST_OWNEDARRAY_BEASTHEADER

-#include "beast_ArrayAllocationBase.h"
-#include "beast_ElementComparator.h"
-#include "../threads/beast_CriticalSection.h"
-
-
 //==============================================================================
 /** An array designed for holding objects.

@@ -52,6 +47,8 @@ template <class ObjectClass,
          class TypeOfCriticalSectionToUse = DummyCriticalSection>

 class OwnedArray
+    : LeakChecked <OwnedArray <ObjectClass, TypeOfCriticalSectionToUse> >
+    , Uncopyable
 {
 public:
    //==============================================================================
@@ -124,8 +121,13 @@ public:
    inline ObjectClass* operator[] (const int index) const noexcept
    {
        const ScopedLockType lock (getLock());
-        return isPositiveAndBelow (index, numUsed) ? data.elements [index]
-                                                   : static_cast <ObjectClass*> (nullptr);
+        if (isPositiveAndBelow (index, numUsed))
+        {
+            bassert (data.elements != nullptr);
+            return data.elements [index];
+        }
+
+        return nullptr;
    }

    /** Returns a pointer to the object at this index in the array, without checking whether the index is in-range.
@@ -136,7 +138,7 @@ public:
    inline ObjectClass* getUnchecked (const int index) const noexcept
    {
        const ScopedLockType lock (getLock());
-        bassert (isPositiveAndBelow (index, numUsed));
+        bassert (isPositiveAndBelow (index, numUsed) && data.elements != nullptr);
        return data.elements [index];
    }

@@ -239,11 +241,13 @@ public:
        @param newObject       the new object to add to the array
        @see set, insert, addIfNotAlreadyThere, addSorted
    */
-    void add (const ObjectClass* const newObject) noexcept
+    ObjectClass* add (ObjectClass* const newObject) noexcept
    {
        const ScopedLockType lock (getLock());
        data.ensureAllocatedSize (numUsed + 1);
+        bassert (data.elements != nullptr);
        data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
+        return const_cast <ObjectClass*> (newObject);
    }

    /** Inserts a new object into the array at the given index.
@@ -264,7 +268,7 @@ public:
        @see add, addSorted, addIfNotAlreadyThere, set
    */
    void insert (int indexToInsertAt,
-                 const ObjectClass* const newObject) noexcept
+                 ObjectClass* const newObject) noexcept
    {
        if (indexToInsertAt >= 0)
        {
@@ -274,6 +278,7 @@ public:
                indexToInsertAt = numUsed;

            data.ensureAllocatedSize (numUsed + 1);
+            bassert (data.elements != nullptr);

            ObjectClass** const e = data.elements + indexToInsertAt;
            const int numToMove = numUsed - indexToInsertAt;
@@ -337,7 +342,7 @@ public:

        @param newObject   the new object to add to the array
    */
-    void addIfNotAlreadyThere (const ObjectClass* const newObject) noexcept
+    void addIfNotAlreadyThere (ObjectClass* const newObject) noexcept
    {
        const ScopedLockType lock (getLock());

@@ -426,6 +431,7 @@ public:
            numElementsToAdd = arrayToAddFrom.size() - startIndex;

        data.ensureAllocatedSize (numUsed + numElementsToAdd);
+        bassert (numElementsToAdd <= 0 || data.elements != nullptr);

        while (--numElementsToAdd >= 0)
        {
@@ -466,6 +472,7 @@ public:
            numElementsToAdd = arrayToAddFrom.size() - startIndex;

        data.ensureAllocatedSize (numUsed + numElementsToAdd);
+        bassert (numElementsToAdd <= 0 || data.elements != nullptr);

        while (--numElementsToAdd >= 0)
        {
@@ -857,9 +864,7 @@ private:
        while (numUsed > 0)
            delete data.elements [--numUsed];
    }
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OwnedArray)
 };


-#endif   // BEAST_OWNEDARRAY_BEASTHEADER
+#endif
--- a/Subtrees/beast/modules/beast_core/containers/beast_PropertySet.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_PropertySet.h
@@ -39,7 +39,7 @@
    See the PropertiesFile class for a subclass of this, which automatically broadcasts change
    messages and saves/loads the list from a file.
 */
-class BEAST_API PropertySet
+class BEAST_API PropertySet : LeakChecked <PropertySet>
 {
 public:
    //==============================================================================
@@ -206,8 +206,6 @@ private:
    PropertySet* fallbackProperties;
    CriticalSection lock;
    bool ignoreCaseOfKeys;
-
-    BEAST_LEAK_DETECTOR (PropertySet)
 };


--- a/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_ReferenceCountedArray.h
@@ -288,14 +288,17 @@ public:
        @param newObject       the new object to add to the array
        @see set, insert, addIfNotAlreadyThere, addSorted, addArray
    */
-    void add (ObjectClass* const newObject) noexcept
+    ObjectClass* add (ObjectClass* const newObject) noexcept
    {
        const ScopedLockType lock (getLock());
        data.ensureAllocatedSize (numUsed + 1);
+        bassert (data.elements != nullptr);
        data.elements [numUsed++] = newObject;

        if (newObject != nullptr)
            newObject->incReferenceCount();
+
+        return newObject;
    }

    /** Inserts a new object into the array at the given index.
@@ -311,8 +314,8 @@ public:
        @param newObject            the new object to add to the array
        @see add, addSorted, addIfNotAlreadyThere, set
    */
-    void insert (int indexToInsertAt,
-                 ObjectClass* const newObject) noexcept
+    ObjectClass* insert (int indexToInsertAt,
+                         ObjectClass* const newObject) noexcept
    {
        if (indexToInsertAt >= 0)
        {
@@ -322,6 +325,7 @@ public:
                indexToInsertAt = numUsed;

            data.ensureAllocatedSize (numUsed + 1);
+            bassert (data.elements != nullptr);

            ObjectClass** const e = data.elements + indexToInsertAt;
            const int numToMove = numUsed - indexToInsertAt;
@@ -335,10 +339,12 @@ public:
                newObject->incReferenceCount();

            ++numUsed;
+
+            return newObject;
        }
        else
        {
-            add (newObject);
+            return add (newObject);
        }
    }

@@ -388,6 +394,7 @@ public:
            else
            {
                data.ensureAllocatedSize (numUsed + 1);
+                bassert (data.elements != nullptr);
                data.elements [numUsed++] = newObject;
            }
        }
@@ -844,7 +851,6 @@ public:
    /** Returns the type of scoped lock to use for locking this array */
    typedef typename TypeOfCriticalSectionToUse::ScopedLockType ScopedLockType;

-
 private:
    //==============================================================================
    ArrayAllocationBase <ObjectClass*, TypeOfCriticalSectionToUse> data;
@@ -852,4 +858,4 @@ private:
 };


-#endif   // BEAST_REFERENCECOUNTEDARRAY_BEASTHEADER
+#endif
--- a/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h
+++ b/Subtrees/beast/modules/beast_core/containers/beast_ScopedValueSetter.h
@@ -52,7 +52,7 @@

 */
 template <typename ValueType>
-class ScopedValueSetter
+class ScopedValueSetter : Uncopyable
 {
 public:
    /** Creates a ScopedValueSetter that will immediately change the specified value to the
@@ -87,8 +87,6 @@ private:
    //==============================================================================
    ValueType& value;
    const ValueType originalValue;
-
-    BEAST_DECLARE_NON_COPYABLE (ScopedValueSetter)
 };


--- a/Subtrees/beast/modules/beast_basics/containers/beast_SharedTable.h
+++ b/Subtrees/beast/modules/beast_basics/containers/beast_SharedTable.h
@@ -26,7 +26,7 @@

    @tparam ElementType The type of element.

-    @ingroup beast_gui
+    @ingroup beast_basics
 */
 template <class ElementType>
 class SharedTable
@@ -72,8 +72,7 @@ public:

 #if BEAST_COMPILER_SUPPORTS_MOVE_SEMANTICS
    SharedTable (SharedTable&& other) noexcept
-:
-    m_data (static_cast < typename Data::Ptr&& > (other.m_data))
+        : m_data (static_cast < typename Data::Ptr&& > (other.m_data))
    {
    }

--- a/Subtrees/beast/modules/beast_basics/containers/beast_SortedLookupTable.h
+++ b/Subtrees/beast/modules/beast_basics/containers/beast_SortedLookupTable.h
@@ -20,30 +20,28 @@
 #ifndef BEAST_SORTEDLOOKUPTABLE_BEASTHEADER
 #define BEAST_SORTEDLOOKUPTABLE_BEASTHEADER

-//==============================================================================
-/**
-  Sorted map for fast lookups.
+/** Sorted map for fast lookups.

-  This container is optimized for a data set with fixed elements.
+    This container is optimized for a data set with fixed elements.

-  SchemaType obeys this concept:
+    SchemaType obeys this concept:

-  @code
+    @code

-  struct SchemaType
-  {
-    typename KeyType;
-    typename ValueType;
+    struct SchemaType
+    {
+        typename KeyType;
+        typename ValueType;

-    // Retrieve the key for a specified value.
-    KeyType getKey (Value const& value);
-  };
+        // Retrieve the key for a specified value.
+        KeyType getKey (Value const& value);
+    };

-  @endcode
+    @endcode

-  To use the table, reserve space with reserveSpaceForValues() if the number
-  of elements is known ahead of time. Then, call insert() for  all the your
-  elements. Call prepareForLookups() once then call lookupValueByKey ()
+    To use the table, reserve space with reserveSpaceForValues() if the number
+    of elements is known ahead of time. Then, call insert() for  all the your
+    elements. Call prepareForLookups() once then call lookupValueByKey ()
 */
 template <class SchemaType>
 class SortedLookupTable
@@ -51,11 +49,8 @@ class SortedLookupTable
 private:
    typedef typename SchemaType::KeyType KeyType;
    typedef typename SchemaType::ValueType ValueType;
-
    typedef std::vector <ValueType> values_t;

-    values_t m_values;
-
 private:
    struct SortCompare
    {
@@ -151,6 +146,9 @@ public:

        return found;
    }
+
+private:
+    values_t m_values;
 };

 #endif
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_Debug.cpp
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_Debug.cpp
@@ -20,35 +20,37 @@
 namespace Debug
 {

-//------------------------------------------------------------------------------
-
-bool isDebuggerAttached ()
-{
-    return beast_isRunningUnderDebugger ();
-}
-
-//------------------------------------------------------------------------------
-
-#if BEAST_DEBUG && defined (beast_breakDebugger)
 void breakPoint ()
 {
-    if (isDebuggerAttached ())
+#if BEAST_DEBUG
+    if (beast_isRunningUnderDebugger ())
        beast_breakDebugger;
-}

 #else
-void breakPoint ()
-{
-    bassertfalse
-}
+    bassertfalse;

 #endif
+}

-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------

 #if BEAST_MSVC && defined (_DEBUG)

-void setHeapAlwaysCheck (bool bAlwaysCheck)
+#if BEAST_CHECK_MEMORY_LEAKS
+struct DebugFlagsInitialiser
+{
+    DebugFlagsInitialiser()
+    {
+        // Activate leak checks on exit in the MSVC Debug CRT (C Runtime)
+        //
+        _CrtSetDbgFlag (_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+    }
+};
+
+static DebugFlagsInitialiser debugFlagsInitialiser;
+#endif
+
+void setAlwaysCheckHeap (bool bAlwaysCheck)
 {
    int flags = _CrtSetDbgFlag (_CRTDBG_REPORT_FLAG);

@@ -78,14 +80,21 @@ void setHeapReportLeaks (bool bReportLeaks)
    _CrtSetDbgFlag (flags);
 }

+void reportLeaks ()
+{
+    _CrtDumpMemoryLeaks ();
+}
+
 void checkHeap ()
 {
    _CrtCheckMemory ();
 }

+//------------------------------------------------------------------------------
+
 #else

-void setHeapAlwaysCheck (bool)
+void setAlwaysCheckHeap (bool)
 {
 }

@@ -97,6 +106,10 @@ void setHeapReportLeaks (bool)
 {
 }

+void reportLeaks ()
+{
+}
+
 void checkHeap ()
 {
 }
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_Debug.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_Debug.h
@@ -17,22 +17,22 @@
 */
 //==============================================================================

-#ifndef BEAST_DEBUG_BEASTHEADER
-#define BEAST_DEBUG_BEASTHEADER
+#ifndef BEAST_DEBUG_H_INCLUDED
+#define BEAST_DEBUG_H_INCLUDED

 // Auxiliary outines for debugging

 namespace Debug
 {

-// Returns true if a debugger is attached, for any build.
-extern bool isDebuggerAttached ();
+/** Break to debugger if a debugger is attached to a debug build.

-// Breaks to the debugger if a debugger is attached.
+    Does nothing if no debugger is attached, or the build is not a debug build.
+*/
 extern void breakPoint ();

-// VF: IS THIS REALLY THE RIGHT PLACE FOR THESE??
-
+// VFALCO NOTE IS THIS REALLY THE RIGHT PLACE FOR THESE??
+//
 // Return only the filename portion of sourceFileName
 // This hides the programmer's directory structure from end-users.
 const String getFileNameFromPath (const char* sourceFileName);
@@ -46,9 +46,34 @@ String stringToCommandLine (const String& s);
 // that can contain newlines and double quotes.
 String commandLineToString (const String& commandLine);

-extern void setHeapAlwaysCheck (bool bAlwaysCheck);
+//
+// These control the MSVC C Runtime Debug heap.
+//
+// The calls currently do nothing on other platforms.
+//
+
+/** Calls checkHeap() at every allocation and deallocation.
+*/
+extern void setAlwaysCheckHeap (bool bAlwaysCheck);
+
+/** Keep freed memory blocks in the heap's linked list, assign them the
+    _FREE_BLOCK type, and fill them with the byte value 0xDD.
+*/
 extern void setHeapDelayedFree (bool bDelayedFree);
+
+/** Perform automatic leak checking at program exit through a call to
+    dumpMemoryLeaks() and generate an error report if the application
+    failed to free all the memory it allocated.
+*/
 extern void setHeapReportLeaks (bool bReportLeaks);
+
+/** Report all memory blocks which have not been freed.
+*/
+extern void reportLeaks ();
+
+/** Confirms the integrity of the memory blocks allocated in the
+    debug heap (debug version only.
+*/
 extern void checkHeap ();

 }
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_Error.cpp
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_Error.cpp
@@ -25,7 +25,7 @@ Error::Error ()
 {
 }

-Error::Error (const Error& other)
+Error::Error (Error const& other)
    : m_code (other.m_code)
    , m_reasonText (other.m_reasonText)
    , m_sourceFileName (other.m_sourceFileName)
@@ -42,7 +42,7 @@ Error::~Error () noexcept
    bassert (!m_needsToBeChecked);
 }

-Error& Error::operator= (const Error& other)
+Error& Error::operator= (Error const& other)
 {
    m_code = other.m_code;
    m_reasonText = other.m_reasonText;
@@ -73,12 +73,12 @@ bool Error::asBoolean () const
    return code () != success;
 }

-const String Error::getReasonText () const
+String const Error::getReasonText () const
 {
    return m_reasonText;
 }

-const String Error::getSourceFilename () const
+String const Error::getSourceFilename () const
 {
    return m_sourceFileName;
 }
@@ -88,9 +88,9 @@ int Error::getLineNumber () const
    return m_lineNumber;
 }

-Error& Error::fail (const char* sourceFileName,
+Error& Error::fail (char const* sourceFileName,
                    int lineNumber,
-                    const String reasonText,
+                    String const reasonText,
                    Code errorCode)
 {
    bassert (m_code == success);
@@ -105,7 +105,7 @@ Error& Error::fail (const char* sourceFileName,
    return *this;
 }

-Error& Error::fail (const char* sourceFileName,
+Error& Error::fail (char const* sourceFileName,
                    int lineNumber,
                    Code errorCode)
 {
@@ -131,9 +131,9 @@ void Error::willBeReported () const
    m_needsToBeChecked = false;
 }

-const char* Error::what () const noexcept
+char const* Error::what () const noexcept
 {
-    if (!m_szWhat)
+    if (! m_szWhat)
    {
        // The application could not be initialized because sqlite was denied access permission
        // The application unexpectedly quit because the exception 'sqlite was denied access permission at file ' was thrown
@@ -152,7 +152,7 @@ const char* Error::what () const noexcept
    return m_szWhat;
 }

-const String Error::getReasonTextForCode (Code code)
+String const Error::getReasonTextForCode (Code code)
 {
    String s;

--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_Error.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_Error.h
@@ -20,31 +20,28 @@
 #ifndef BEAST_ERROR_BEASTHEADER
 #define BEAST_ERROR_BEASTHEADER

-#include "beast_SafeBool.h"
+/** A concise error report.

-/**
-  A concise error report.
+    This lightweight but flexible class records lets you record the file and
+    line where a recoverable error occurred, along with some optional human
+    readable text.

-  This lightweight but flexible class records lets you record the file and
-  line where a recoverable error occurred, along with some optional human
-  readable text.
+    A recoverable error can be passed along and turned into a non recoverable
+    error by throwing the object: it's derivation from std::exception is
+    fully compliant with the C++ exception interface.

-  A recoverable error can be passed along and turned into a non recoverable
-  error by throwing the object: it's derivation from std::exception is
-  fully compliant with the C++ exception interface.
-
-  @ingroup beast_core
+    @ingroup beast_core
 */
-class Error
+class BEAST_API Error
    : public std::exception
    , public SafeBool <Error>
 {
 public:
    /** Numeric code.

-      This enumeration is useful when the caller needs to take different
-      actions depending on the failure. For example, trying again later if
-      a file is locked.
+        This enumeration is useful when the caller needs to take different
+        actions depending on the failure. For example, trying again later if
+        a file is locked.
    */
    enum Code
    {
@@ -74,8 +71,8 @@ public:
    };

    Error ();
-    Error (const Error& other);
-    Error& operator= (const Error& other);
+    Error (Error const& other);
+    Error& operator= (Error const& other);

    virtual ~Error () noexcept;

@@ -84,16 +81,16 @@ public:

    bool asBoolean () const;

-    const String getReasonText () const;
-    const String getSourceFilename () const;
+    String const getReasonText () const;
+    String const getSourceFilename () const;
    int getLineNumber () const;

-    Error& fail (const char* sourceFileName,
+    Error& fail (char const* sourceFileName,
                 int lineNumber,
-                 const String reasonText,
+                 String const reasonText,
                 Code errorCode = general);

-    Error& fail (const char* sourceFileName,
+    Error& fail (char const* sourceFileName,
                 int lineNumber,
                 Code errorCode = general);

@@ -108,9 +105,9 @@ public:
    // for std::exception. This lets you throw an Error that should
    // terminate the application. The what() message will be less
    // descriptive so ideally you should catch the Error object instead.
-    const char* what () const noexcept;
+    char const* what () const noexcept;

-    static const String getReasonTextForCode (Code code);
+    static String const getReasonTextForCode (Code code);

 private:
    Code m_code;
@@ -118,9 +115,8 @@ private:
    String m_sourceFileName;
    int m_lineNumber;
    mutable bool m_needsToBeChecked;
-
    mutable String m_what; // created on demand
-    mutable const char* m_szWhat;
+    mutable char const* m_szWhat;
 };

 #endif
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_FPUFlags.cpp
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_FPUFlags.cpp
@@ -17,7 +17,7 @@
 */
 //==============================================================================

-void FPUFlags::clearUnsetFlagsFrom (const FPUFlags& flags)
+void FPUFlags::clearUnsetFlagsFrom (FPUFlags const& flags)
 {
    if (!flags.getMaskNaNs ().is_set ())         m_maskNaNs.clear ();

--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_FPUFlags.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_FPUFlags.h
@@ -28,7 +28,7 @@

    @ingroup beast_core
 */
-class FPUFlags
+class BEAST_API FPUFlags
 {
 public:
    /** An individual FPU flag */
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_LeakChecked.cpp
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_LeakChecked.cpp
@@ -17,10 +17,9 @@
 */
 //==============================================================================

-#if BEAST_USE_LEAKCHECKED
+namespace Implemented
+{

-/*============================================================================*/
-// Type-independent portion of Counter
 class LeakCheckedBase::CounterBase::Singleton
 {
 public:
@@ -29,16 +28,16 @@ public:
        m_list.push_front (counter);
    }

-    void detectAllLeaks ()
+    void checkForLeaks ()
    {
        for (;;)
        {
-            CounterBase* counter = m_list.pop_front ();
+            CounterBase* const counter = m_list.pop_front ();

            if (!counter)
                break;

-            counter->detectLeaks ();
+            counter->checkForLeaks ();
        }
    }

@@ -50,6 +49,8 @@ public:
    }

 private:
+    friend class LeakCheckedBase;
+
    LockFreeStack <CounterBase> m_list;
 };

@@ -60,12 +61,7 @@ LeakCheckedBase::CounterBase::CounterBase ()
    Singleton::getInstance ().push_back (this);
 }

-void LeakCheckedBase::CounterBase::detectAllLeaks ()
-{
-    Singleton::getInstance ().detectAllLeaks ();
-}
-
-void LeakCheckedBase::CounterBase::detectLeaks ()
+void LeakCheckedBase::CounterBase::checkForLeaks ()
 {
    // If there's a runtime error from this line, it means there's
    // an order of destruction problem between different translation units!
@@ -76,16 +72,51 @@ void LeakCheckedBase::CounterBase::detectLeaks ()

    if (count > 0)
    {
-        bassertfalse;
-        DBG ("[LEAK] " << count << " of " << getClassName ());
+        /** If you hit this, then you've leaked one or more objects of the
+            specified class; the name should have been printed by the line
+            below.
+
+            If you're leaking, it's probably because you're using old-fashioned,
+            non-RAII techniques for your object management. Tut, tut. Always,
+            always use ScopedPointers, OwnedArrays, ReferenceCountedObjects,
+            etc, and avoid the 'delete' operator at all costs!
+        */
+        DBG ("Leaked objects: " << count << " of " << getClassName ());
+
+        //bassertfalse;
    }
 }

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

-void LeakCheckedBase::detectAllLeaks ()
+void LeakCheckedBase::reportDanglingPointer (char const* objectName)
 {
-    CounterBase::detectAllLeaks ();
+    /*  If you hit this, then you've managed to delete more instances
+        of this class than you've created. That indicates that you're
+        deleting some dangling pointers.
+
+        Note that although this assertion will have been triggered
+        during a destructor, it might not be this particular deletion
+        that's at fault - the incorrect one may have happened at an
+        earlier point in the program, and simply not been detected
+        until now.
+
+        Most errors like this are caused by using old-fashioned,
+        non-RAII techniques for your object management. Tut, tut.
+        Always, always use ScopedPointers, OwnedArrays,
+        ReferenceCountedObjects, etc, and avoid the 'delete' operator
+        at all costs!
+    */
+    DBG ("Dangling pointer deletion: " << objectName);
+
+    bassertfalse;
 }

-#endif
+//------------------------------------------------------------------------------
+
+void LeakCheckedBase::checkForLeaks ()
+{
+    CounterBase::Singleton::getInstance ().checkForLeaks ();
+}
+
+}
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_LeakChecked.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_LeakChecked.h
@@ -17,25 +17,14 @@
 */
 //==============================================================================

-#ifndef BEAST_LEAKCHECKED_BEASTHEADER
-#define BEAST_LEAKCHECKED_BEASTHEADER
+#ifndef BEAST_LEAKCHECKED_H_INCLUDED
+#define BEAST_LEAKCHECKED_H_INCLUDED

-#include "beast_Error.h"
-#include "beast_Throw.h"
-#include "../memory/beast_StaticObject.h"
-#include "../containers/beast_LockFreeStack.h"
-
-//
-// Derived classes are automatically leak-checked on exit
-//
-
-#if BEAST_USE_LEAKCHECKED
-
-class LeakCheckedBase
+namespace Implemented
 {
-public:
-    static void detectAllLeaks ();

+class BEAST_API LeakCheckedBase
+{
 protected:
    class CounterBase : public LockFreeStack <CounterBase>::Node
    {
@@ -56,18 +45,26 @@ protected:

        virtual char const* getClassName () const = 0;

-        static void detectAllLeaks ();
-
    private:
-        void detectLeaks ();
+        void checkForLeaks ();

        virtual void checkPureVirtual () const = 0;

-    protected:
+    private:
+        friend class LeakCheckedBase;
+
        class Singleton;

        Atomic <int> m_count;
    };
+
+protected:
+    static void reportDanglingPointer (char const* objectName);
+
+private:
+    friend class PerformedAtExit::ExitHook;
+
+    static void checkForLeaks ();
 };

 //------------------------------------------------------------------------------
@@ -83,32 +80,25 @@ class LeakChecked : private LeakCheckedBase
 protected:
    LeakChecked () noexcept
    {
-        if (getLeakCheckedCounter ().increment () == 0)
-        {
-            DBG ("[LOGIC] " << getLeakCheckedName ());
-            Throw (Error ().fail (__FILE__, __LINE__));
-        }
+        getCounter ().increment ();
    }

-    LeakChecked (const LeakChecked&) noexcept
+    LeakChecked (LeakChecked const&) noexcept
    {
-        if (getLeakCheckedCounter ().increment () == 0)
-        {
-            DBG ("[LOGIC] " << getLeakCheckedName ());
-            Throw (Error ().fail (__FILE__, __LINE__));
-        }
+        getCounter ().increment ();
    }

    ~LeakChecked ()
    {
-        if (getLeakCheckedCounter ().decrement () < 0)
+        if (getCounter ().decrement () < 0)
        {
-            DBG ("[LOGIC] " << getLeakCheckedName ());
-            Throw (Error ().fail (__FILE__, __LINE__));
+            reportDanglingPointer (getLeakCheckedName ());
        }
    }

 private:
+    // Singleton that maintains the count of this object
+    //
    class Counter : public CounterBase
    {
    public:
@@ -135,30 +125,39 @@ private:
        return typeid (Object).name ();
    }

-    static Counter& getLeakCheckedCounter () noexcept
+    // Retrieve the singleton for this object
+    //
+    static Counter& getCounter () noexcept
    {
        static Counter* volatile s_instance;
        static Static::Initializer s_initializer;

-        if (s_initializer.begin ())
+        if (s_initializer.beginConstruction ())
        {
            static char s_storage [sizeof (Counter)];
            s_instance = new (s_storage) Counter;
-            s_initializer.end ();
+
+            s_initializer.endConstruction ();
        }

        return *s_instance;
    }
 };

-#else
+}

-class LeakCheckedBase
+//------------------------------------------------------------------------------
+
+namespace Dummy
+{
+
+class BEAST_API LeakCheckedBase
 {
 private:
    friend class PerformedAtExit;

-    static void detectAllLeaks () { }
+public:
+    static void checkForLeaks () { }
 };

 template <class Object>
@@ -166,6 +165,18 @@ struct LeakChecked : LeakCheckedBase
 {
 };

+}
+
+//------------------------------------------------------------------------------
+
+// Lift the corresponding implementation
+//
+#if BEAST_CHECK_MEMORY_LEAKS
+using Implemented::LeakChecked;
+using Implemented::LeakCheckedBase;
+#else
+using Dummy::LeakChecked;
+using Dummy::LeakCheckedBase;
 #endif

 #endif
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_SafeBool.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_SafeBool.h
@@ -40,7 +40,7 @@
  @ingroup beast_core
 */

-class SafeBoolBase
+class BEAST_API SafeBoolBase
 {
 private:
    void disallowed () const { }
--- a/Subtrees/beast/modules/beast_basics/diagnostic/beast_Throw.h
+++ b/Subtrees/beast/modules/beast_basics/diagnostic/beast_Throw.h
@@ -17,16 +17,14 @@
 */
 //==============================================================================

-#ifndef BEAST_THROW_BEASTHEADER
-#define BEAST_THROW_BEASTHEADER
+#ifndef BEAST_THROW_H_INCLUDED
+#define BEAST_THROW_H_INCLUDED

-#include "beast_Debug.h"
-
-//
-// Throw an exception, with the opportunity to get a
-// breakpoint with the call stack before the throw.
-//
+/** Throw an exception, with a debugger hook.

+    This provides an opportunity to utilize the debugger before
+    the stack is unwound.
+*/
 template <class Exception>
 inline void Throw (Exception const& e)
 {
--- a/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.h
@@ -41,7 +41,7 @@

    It can also guess how far it's got using a wildly inaccurate algorithm.
 */
-class BEAST_API DirectoryIterator
+class BEAST_API DirectoryIterator : LeakChecked <DirectoryIterator>, Uncopyable
 {
 public:
    //==============================================================================
@@ -116,7 +116,7 @@ public:

 private:
    //==============================================================================
-    class NativeIterator
+    class NativeIterator : LeakChecked <NativeIterator>, Uncopyable
    {
    public:
        NativeIterator (const File& directory, const String& wildCard);
@@ -132,8 +132,6 @@ private:
        friend class DirectoryIterator;
        friend class ScopedPointer<Pimpl>;
        ScopedPointer<Pimpl> pimpl;
-
-        BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NativeIterator)
    };

    friend class ScopedPointer<NativeIterator::Pimpl>;
@@ -147,8 +145,6 @@ private:
    bool hasBeenAdvanced;
    ScopedPointer <DirectoryIterator> subIterator;
    File currentFile;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectoryIterator)
 };

 #endif   // BEAST_DIRECTORYITERATOR_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/files/beast_File.cpp
+++ b/Subtrees/beast/modules/beast_core/files/beast_File.cpp
@@ -21,11 +21,46 @@
 */
 //==============================================================================

+// We need to make a shared singleton or else there are
+// issues with the leak detector and order of detruction.
+//
+class NonexistentHolder : public SharedSingleton <NonexistentHolder>
+{
+public:
+    NonexistentHolder ()
+        : SharedSingleton <NonexistentHolder> (SingletonLifetime::persistAfterCreation)
+    {
+    }
+
+    static NonexistentHolder* createInstance ()
+    {
+        return new NonexistentHolder;
+    }
+
+    File const file;
+};
+
+File const& File::nonexistent ()
+{
+    return NonexistentHolder::getInstance ()->file;
+}
+
+//------------------------------------------------------------------------------
+
 File::File (const String& fullPathName)
    : fullPath (parseAbsolutePath (fullPathName))
 {
 }

+File::File (const File& other)
+    : fullPath (other.fullPath)
+{
+}
+
+File::~File() noexcept
+{
+}
+
 File File::createFileWithoutCheckingPath (const String& path) noexcept
 {
    File f;
@@ -33,11 +68,6 @@ File File::createFileWithoutCheckingPath (const String& path) noexcept
    return f;
 }

-File::File (const File& other)
-    : fullPath (other.fullPath)
-{
-}
-
 File& File::operator= (const String& newPath)
 {
    fullPath = parseAbsolutePath (newPath);
@@ -63,9 +93,6 @@ File& File::operator= (File&& other) noexcept
 }
 #endif

-const File File::nonexistent;
-
-
 //==============================================================================
 String File::parseAbsolutePath (const String& p)
 {
@@ -317,7 +344,7 @@ String File::getFileNameWithoutExtension() const

 bool File::isAChildOf (const File& potentialParent) const
 {
-    if (potentialParent == File::nonexistent)
+    if (potentialParent == File::nonexistent ())
        return false;

    const String ourPath (getPathUpToLastSlash());
@@ -629,7 +656,7 @@ bool File::hasFileExtension (const String& possibleSuffix) const
 File File::withFileExtension (const String& newExtension) const
 {
    if (fullPath.isEmpty())
-        return File::nonexistent;
+        return File::nonexistent ();

    String filePart (getFileName());

@@ -910,7 +937,7 @@ public:
        const File home (File::getSpecialLocation (File::userHomeDirectory));
        const File temp (File::getSpecialLocation (File::tempDirectory));

-        expect (! File::nonexistent.exists());
+        expect (! File::nonexistent ().exists());
        expect (home.isDirectory());
        expect (home.exists());
        expect (! home.existsAsFile());
--- a/Subtrees/beast/modules/beast_core/files/beast_File.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_File.h
@@ -46,14 +46,14 @@ class FileOutputStream;

    @see FileInputStream, FileOutputStream
 */
-class BEAST_API File
+class BEAST_API File : LeakChecked <File>
 {
 public:
    //==============================================================================
    /** Creates an (invalid) file object.

        The file is initially set to an empty path, so getFullPath() will return
-        an empty string, and comparing the file to File::nonexistent will return
+        an empty string, and comparing the file to File::nonexistent() will return
        true.

        You can use its operator= method to point it at a proper file.
@@ -76,7 +76,7 @@ public:
    File (const File& other);

    /** Destructor. */
-    ~File() noexcept  {}
+    ~File() noexcept;

    /** Sets the file based on an absolute pathname.

@@ -100,7 +100,7 @@ public:

    //==============================================================================
    /** This static constant is used for referring to an 'invalid' file. */
-    static const File nonexistent;
+    static File const& nonexistent ();

    //==============================================================================
    /** Checks whether the file actually exists.
@@ -246,20 +246,21 @@ public:
    int64 hashCode64() const;

    //==============================================================================
-    /** Returns a file based on a relative path.
+    /** Returns a file that represents a relative (or absolute) sub-path of the current one.

        This will find a child file or directory of the current object.

        e.g.
            File ("/moose/fish").getChildFile ("foo.txt") will produce "/moose/fish/foo.txt".
+            File ("/moose/fish").getChildFile ("haddock/foo.txt") will produce "/moose/fish/haddock/foo.txt".
            File ("/moose/fish").getChildFile ("../foo.txt") will produce "/moose/foo.txt".

        If the string is actually an absolute path, it will be treated as such, e.g.
-            File ("/moose/fish").getChildFile ("/foo.txt") will produce "/foo.txt"
+        File ("/moose/fish").getChildFile ("/foo.txt") will produce "/foo.txt"

        @see getSiblingFile, getParentDirectory, getRelativePathFrom, isAChildOf
    */
-    File getChildFile (String relativePath) const;
+    File getChildFile (String relativeOrAbsolutePath) const;

    /** Returns a file which is in the same directory as this one.

@@ -948,8 +949,6 @@ private:
    bool setFileTimesInternal (int64 m, int64 a, int64 c) const;
    void getFileTimesInternal (int64& m, int64& a, int64& c) const;
    bool setFileReadOnlyInternal (bool) const;
-
-    BEAST_LEAK_DETECTOR (File)
 };

 #endif   // BEAST_FILE_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/files/beast_FileInputStream.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_FileInputStream.h
@@ -34,7 +34,9 @@

    @see InputStream, FileOutputStream, File::createInputStream
 */
-class BEAST_API FileInputStream  : public InputStream
+class BEAST_API FileInputStream
+    : public InputStream
+    , LeakChecked <FileInputStream>
 {
 public:
    //==============================================================================
@@ -87,8 +89,6 @@ private:
    void openHandle();
    void closeHandle();
    size_t readInternal (void* buffer, size_t numBytes);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileInputStream)
 };

 #endif   // BEAST_FILEINPUTSTREAM_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/files/beast_FileOutputStream.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_FileOutputStream.h
@@ -34,7 +34,9 @@

    @see OutputStream, FileInputStream, File::createOutputStream
 */
-class BEAST_API FileOutputStream  : public OutputStream
+class BEAST_API FileOutputStream
+    : public OutputStream
+    , LeakChecked <FileOutputStream>
 {
 public:
    //==============================================================================
@@ -107,8 +109,6 @@ private:
    bool flushBuffer();
    int64 setPositionInternal (int64);
    ssize_t writeInternal (const void*, size_t);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileOutputStream)
 };

 #endif   // BEAST_FILEOUTPUTSTREAM_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/files/beast_FileSearchPath.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_FileSearchPath.h
@@ -34,7 +34,7 @@

    @see File
 */
-class BEAST_API FileSearchPath
+class BEAST_API FileSearchPath : LeakChecked <FileSearchPath>
 {
 public:
    //==============================================================================
@@ -157,8 +157,6 @@ private:
    StringArray directories;

    void init (const String& path);
-
-    BEAST_LEAK_DETECTOR (FileSearchPath)
 };

 #endif   // BEAST_FILESEARCHPATH_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_MemoryMappedFile.h
@@ -30,7 +30,7 @@
 /**
    Maps a file into virtual memory for easy reading and/or writing.
 */
-class BEAST_API MemoryMappedFile
+class BEAST_API MemoryMappedFile : LeakChecked <MemoryMappedFile>, Uncopyable
 {
 public:
    /** The read/write flags used when opening a memory mapped file. */
@@ -103,8 +103,6 @@ private:
   #endif

    void openInternal (const File&, AccessMode);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MemoryMappedFile)
 };


--- a/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.cpp
+++ b/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.cpp
@@ -45,7 +45,7 @@ TemporaryFile::TemporaryFile (const File& target, const int optionFlags)
      targetFile (target)
 {
    // If you use this constructor, you need to give it a valid target file!
-    bassert (targetFile != File::nonexistent);
+    bassert (targetFile != File::nonexistent ());
 }

 TemporaryFile::TemporaryFile (const File& target, const File& temporary)
@@ -74,7 +74,7 @@ bool TemporaryFile::overwriteTargetFileWithTemporary() const
 {
    // This method only works if you created this object with the constructor
    // that takes a target file!
-    bassert (targetFile != File::nonexistent);
+    bassert (targetFile != File::nonexistent ());

    if (temporaryFile.exists())
    {
--- a/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h
+++ b/Subtrees/beast/modules/beast_core/files/beast_TemporaryFile.h
@@ -65,7 +65,7 @@

    @see File, FileOutputStream
 */
-class BEAST_API TemporaryFile
+class BEAST_API TemporaryFile : LeakChecked <TemporaryFile>, Uncopyable
 {
 public:
    //==============================================================================
@@ -159,8 +159,6 @@ public:
 private:
    //==============================================================================
    const File temporaryFile, targetFile;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemporaryFile)
 };

 #endif   // BEAST_TEMPORARYFILE_BEASTHEADER
--- a/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h
+++ b/Subtrees/beast/modules/beast_core/logging/beast_FileLogger.h
@@ -35,7 +35,10 @@

    @see Logger
 */
-class BEAST_API FileLogger  : public Logger
+class BEAST_API FileLogger
+    : public Logger
+    , LeakChecked <FileLogger>
+    , Uncopyable
 {
 public:
    //==============================================================================
@@ -126,8 +129,6 @@ private:
    CriticalSection logLock;

    void trimFileSize (int64 maxFileSizeBytes) const;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileLogger)
 };


--- a/Subtrees/beast/modules/beast_core/maths/beast_BigInteger.h
+++ b/Subtrees/beast/modules/beast_core/maths/beast_BigInteger.h
@@ -39,7 +39,7 @@ class MemoryBlock;
    Negative values are possible, but the value isn't stored as 2s-complement, so
    be careful if you use negative values and look at the values of individual bits.
 */
-class BEAST_API BigInteger
+class BEAST_API BigInteger : LeakChecked <BigInteger>
 {
 public:
    //==============================================================================
@@ -312,8 +312,6 @@ private:
    void ensureSize (size_t numVals);
    void shiftLeft (int bits, int startBit);
    void shiftRight (int bits, int startBit);
-
-    BEAST_LEAK_DETECTOR (BigInteger)
 };

 /** Writes a BigInteger to an OutputStream as a UTF8 decimal string. */
--- a/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp
+++ b/Subtrees/beast/modules/beast_core/maths/beast_Expression.cpp
@@ -21,7 +21,8 @@
 */
 //==============================================================================

-class Expression::Term  : public SingleThreadedReferenceCountedObject
+class Expression::Term
+    : public SingleThreadedReferenceCountedObject
 {
 public:
    Term() {}
@@ -69,9 +70,6 @@ public:
        for (int i = getNumInputs(); --i >= 0;)
            getInput(i)->visitAllSymbols (visitor, scope, recursionDepth);
    }
-
-private:
-    BEAST_DECLARE_NON_COPYABLE (Term)
 };


@@ -295,7 +293,8 @@ struct Expression::Helpers
    };

    //==============================================================================
-    class DotOperator  : public BinaryTerm
+    class DotOperator
+        : public BinaryTerm
    {
    public:
        DotOperator (SymbolTerm* const l, Term* const r)  : BinaryTerm (l, r) {}
@@ -345,7 +344,9 @@ struct Expression::Helpers

    private:
        //==============================================================================
-        class EvaluationVisitor  : public Scope::Visitor
+        class EvaluationVisitor
+            : public Scope::Visitor
+            , Uncopyable
        {
        public:
            EvaluationVisitor (const TermPtr& t, const int recursion)
@@ -356,12 +357,11 @@ struct Expression::Helpers
            const TermPtr input;
            TermPtr output;
            const int recursionCount;
-
-        private:
-            BEAST_DECLARE_NON_COPYABLE (EvaluationVisitor)
        };

-        class SymbolVisitingVisitor  : public Scope::Visitor
+        class SymbolVisitingVisitor
+            : public Scope::Visitor
+            , Uncopyable
        {
        public:
            SymbolVisitingVisitor (const TermPtr& t, SymbolVisitor& v, const int recursion)
@@ -373,11 +373,11 @@ struct Expression::Helpers
            const TermPtr input;
            SymbolVisitor& visitor;
            const int recursionCount;
-
-            BEAST_DECLARE_NON_COPYABLE (SymbolVisitingVisitor)
        };

-        class SymbolRenamingVisitor   : public Scope::Visitor
+        class SymbolRenamingVisitor
+            : public Scope::Visitor
+            , Uncopyable
        {
        public:
            SymbolRenamingVisitor (const TermPtr& t, const Expression::Symbol& symbol_, const String& newName_, const int recursionCount_)
@@ -390,13 +390,9 @@ struct Expression::Helpers
            const Symbol& symbol;
            const String newName;
            const int recursionCount;
-
-            BEAST_DECLARE_NON_COPYABLE (SymbolRenamingVisitor)
        };

        SymbolTerm* getSymbol() const  { return static_cast <SymbolTerm*> (left.get()); }
-
-        BEAST_DECLARE_NON_COPYABLE (DotOperator)
    };

    //==============================================================================
@@ -446,7 +442,7 @@ struct Expression::Helpers
    };

    //==============================================================================
-    class Add  : public BinaryTerm
+    class Add : public BinaryTerm
    {
    public:
        Add (Term* const l, Term* const r) : BinaryTerm (l, r) {}
@@ -465,13 +461,10 @@ struct Expression::Helpers

            return new Subtract (newDest, (input == left ? right : left)->clone());
        }
-
-    private:
-        BEAST_DECLARE_NON_COPYABLE (Add)
    };

    //==============================================================================
-    class Subtract  : public BinaryTerm
+    class Subtract : public BinaryTerm
    {
    public:
        Subtract (Term* const l, Term* const r) : BinaryTerm (l, r) {}
@@ -493,13 +486,10 @@ struct Expression::Helpers

            return new Subtract (left->clone(), newDest);
        }
-
-    private:
-        BEAST_DECLARE_NON_COPYABLE (Subtract)
    };

    //==============================================================================
-    class Multiply  : public BinaryTerm
+    class Multiply : public BinaryTerm
    {
    public:
        Multiply (Term* const l, Term* const r) : BinaryTerm (l, r) {}
@@ -518,13 +508,10 @@ struct Expression::Helpers

            return new Divide (newDest, (input == left ? right : left)->clone());
        }
-
-    private:
-        BEAST_DECLARE_NON_COPYABLE (Multiply)
    };

    //==============================================================================
-    class Divide  : public BinaryTerm
+    class Divide : public BinaryTerm
    {
    public:
        Divide (Term* const l, Term* const r) : BinaryTerm (l, r) {}
@@ -546,9 +533,6 @@ struct Expression::Helpers

            return new Divide (left->clone(), newDest);
        }
-
-    private:
-        BEAST_DECLARE_NON_COPYABLE (Divide)
    };

    //==============================================================================
@@ -621,7 +605,9 @@ struct Expression::Helpers
    }

    //==============================================================================
-    class SymbolCheckVisitor  : public Term::SymbolVisitor
+    class SymbolCheckVisitor
+        : public Term::SymbolVisitor
+        , Uncopyable
    {
    public:
        SymbolCheckVisitor (const Symbol& symbol_) : wasFound (false), symbol (symbol_) {}
@@ -631,12 +617,12 @@ struct Expression::Helpers

    private:
        const Symbol& symbol;
-
-        BEAST_DECLARE_NON_COPYABLE (SymbolCheckVisitor)
    };

    //==============================================================================
-    class SymbolListVisitor  : public Term::SymbolVisitor
+    class SymbolListVisitor
+        : public Term::SymbolVisitor
+        , Uncopyable
    {
    public:
        SymbolListVisitor (Array<Symbol>& list_) : list (list_) {}
@@ -644,12 +630,10 @@ struct Expression::Helpers

    private:
        Array<Symbol>& list;
-
-        BEAST_DECLARE_NON_COPYABLE (SymbolListVisitor)
    };

    //==============================================================================
-    class Parser
+    class Parser : Uncopyable
    {
    public:
        //==============================================================================
@@ -908,8 +892,6 @@ struct Expression::Helpers

            return e;
        }
-
-        BEAST_DECLARE_NON_COPYABLE (Parser)
    };
 };

--- a/Subtrees/beast/modules/beast_basics/math/beast_Interval.h
+++ b/Subtrees/beast/modules/beast_basics/math/beast_Interval.h
--- a/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h
+++ b/Subtrees/beast/modules/beast_core/maths/beast_MathsFunctions.h
@@ -199,7 +199,7 @@ void findMinAndMax (const Type* values, int numValues, Type& lowest, Type& highe
    @param valueToConstrain     the value to try to return
    @returns    the closest value to valueToConstrain which lies between lowerLimit
                and upperLimit (inclusive)
-    @see jlimit0To, bmin, bmax
+    @see blimit0To, bmin, bmax
 */
 template <typename Type>
 inline Type blimit (const Type lowerLimit,
--- a/Subtrees/beast/modules/beast_core/maths/beast_Random.h
+++ b/Subtrees/beast/modules/beast_core/maths/beast_Random.h
@@ -33,7 +33,7 @@

    You can create a Random object and use it to generate a sequence of random numbers.
 */
-class BEAST_API Random
+class BEAST_API Random : LeakChecked <Random>
 {
 public:
    //==============================================================================
@@ -127,8 +127,6 @@ public:
 private:
    //==============================================================================
    int64 seed;
-
-    BEAST_LEAK_DETECTOR (Random)
 };


--- a/Subtrees/beast/modules/beast_core/memory/beast_Atomic.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_Atomic.h
@@ -148,10 +148,14 @@ public:
    volatile Type value;

 private:
-    static inline Type castFrom32Bit (int32 value) noexcept   { return *(Type*) &value; }
-    static inline Type castFrom64Bit (int64 value) noexcept   { return *(Type*) &value; }
-    static inline int32 castTo32Bit (Type value) noexcept     { return *(int32*) &value; }
-    static inline int64 castTo64Bit (Type value) noexcept     { return *(int64*) &value; }
+    template <typename Dest, typename Source>
+    static inline Dest castTo (Source value) noexcept { union { Dest d; Source s; } u; u.s = value; return u.d; }
+
+    static inline Type castFrom32Bit (int32 value) noexcept { return castTo <Type, int32> (value); }
+    static inline Type castFrom64Bit (int64 value) noexcept { return castTo <Type, int64> (value); }
+    static inline int32 castTo32Bit (Type value) noexcept { return castTo <int32, Type> (value); }
+    static inline int64 castTo64Bit (Type value) noexcept { return castTo <int64, Type> (value); }
+

    Type operator++ (int); // better to just use pre-increment with atomics..
    Type operator-- (int);
--- a/Subtrees/beast/modules/beast_basics/memory/beast_AtomicCounter.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_AtomicCounter.h
@@ -30,7 +30,7 @@

    @ingroup beast_core
 */
-class AtomicCounter
+class BEAST_API AtomicCounter
 {
 public:
    /** Create a new counter.
--- a/Subtrees/beast/modules/beast_basics/memory/beast_AtomicFlag.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_AtomicFlag.h
@@ -30,7 +30,7 @@

    @ingroup beast_core
 */
-class AtomicFlag
+class BEAST_API AtomicFlag
 {
 public:
    /** Create an AtomicFlag in the reset state. */
--- a/Subtrees/beast/modules/beast_basics/memory/beast_AtomicPointer.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_AtomicPointer.h
--- a/Subtrees/beast/modules/beast_basics/memory/beast_AtomicState.h
+++ b/Subtrees/beast/modules/beast_basics/memory/beast_AtomicState.h
@@ -29,7 +29,7 @@

    @ingroup beast_core
 */
-class AtomicState
+class BEAST_API AtomicState
 {
 public:
    /** Create a new state with an optional starting value.
--- a/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h
+++ b/Subtrees/beast/modules/beast_core/memory/beast_ByteOrder.h
@@ -29,7 +29,7 @@
 /** Contains static methods for converting the byte order between different
    endiannesses.
 */
-class BEAST_API ByteOrder
+class BEAST_API ByteOrder : Uncopyable
 {
 public:
    //==============================================================================
@@ -93,8 +93,6 @@ public:

 private:
    ByteOrder();
-
-    BEAST_DECLARE_NON_COPYABLE (ByteOrder)
 };


--- a/Show More
+++ b/Show More