Tidy up beast project files

Builds/VisualStudio2012/beast.vcxproj

@@ -90,7 +90,7 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapperStrand.h" />
-    <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h" />
+    <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h" />
     <ClInclude Include="..\..\modules\beast_asio\system\beast_OpenSSLIncludes.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.h" />
@@ -104,8 +104,6 @@
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncServer.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_PeerTest.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerType.h" />
-    <ClInclude Include="..\..\modules\beast_boost\beast_boost.h" />
-    <ClInclude Include="..\..\modules\beast_boost\traits\beast_BoostLockableTraits.h" />
     <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
     <ClInclude Include="..\..\modules\beast_core\containers\beast_AbstractFifo.h" />
     <ClInclude Include="..\..\modules\beast_core\containers\beast_Array.h" />
@@ -295,6 +293,8 @@
     <ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h" />
     <ClInclude Include="..\..\modules\beast_db\beast_db.h" />
     <ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h" />
+    <ClInclude Include="..\..\modules\beast_extras\beast_extras.h" />
+    <ClInclude Include="..\..\modules\beast_extras\traits\beast_BoostLockableTraits.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\backend.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\blob.h" />
     <ClInclude Include="..\..\modules\beast_sqdb\api\into.h" />
@@ -416,7 +416,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_boost\beast_boost.cpp" />
     <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>
@@ -1150,6 +1149,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp" />
     <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.cpp" />
     <ClCompile Include="..\..\modules\beast_sqdb\source\blob.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1306,7 +1306,7 @@
       </PrecompiledHeader>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -1321,7 +1321,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -1338,7 +1338,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Builds/VisualStudio2012/beast.vcxproj.filters

@@ -143,12 +143,6 @@
     <Filter Include="beast_asio\async">
       <UniqueIdentifier>{beb81776-4aad-401d-8826-81478dbbf30b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_boost">
-      <UniqueIdentifier>{0eac8b8d-7049-4eda-b6b4-53194d336a97}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="beast_boost\traits">
-      <UniqueIdentifier>{1e6959ed-fcb9-4a3b-ac5a-eb26973e21f6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="beast_core\thread">
       <UniqueIdentifier>{493db217-b3e4-4b08-97b2-a2d753cc8c35}</UniqueIdentifier>
     </Filter>
@@ -161,6 +155,12 @@
     <Filter Include="beast_core\functional">
       <UniqueIdentifier>{5df65855-1ccd-4997-97c1-f9788924ee2b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="beast_extras">
+      <UniqueIdentifier>{2f5b95a8-1adf-4319-8464-ddc2b2e03f0b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast_extras\traits">
+      <UniqueIdentifier>{bf498396-2e1f-4903-be68-3053ba439af5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\beast_core\beast_core.h">
@@ -695,9 +695,6 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_Socket.h">
       <Filter>beast_asio\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h">
-      <Filter>beast_asio\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h">
       <Filter>beast_asio\tests</Filter>
     </ClInclude>
@@ -794,18 +791,12 @@
     <ClInclude Include="..\..\modules\beast_core\diagnostic\MeasureFunctionCallTime.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_boost\beast_boost.h">
-      <Filter>beast_boost</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\threads\beast_SharedData.h">
       <Filter>beast_core\threads</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_boost\traits\beast_BoostLockableTraits.h">
-      <Filter>beast_boost\traits</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\thread\MutexTraits.h">
       <Filter>beast_core\thread</Filter>
     </ClInclude>
@@ -911,6 +902,15 @@
     <ClInclude Include="..\..\modules\beast_asio\beast_asio.h">
       <Filter>beast_asio</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h">
+      <Filter>beast_asio\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_extras\traits\beast_BoostLockableTraits.h">
+      <Filter>beast_extras\traits</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_extras\beast_extras.h">
+      <Filter>beast_extras</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
@@ -1327,9 +1327,6 @@
     <ClCompile Include="..\..\modules\beast_asio\async\beast_SharedHandler.cpp">
       <Filter>beast_asio\async</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_boost\beast_boost.cpp">
-      <Filter>beast_boost</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
@@ -1387,6 +1384,9 @@
     <ClCompile Include="..\..\modules\beast_asio\basics\SSLContext.cpp">
       <Filter>beast_asio\basics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_extras\beast_extras.cpp">
+      <Filter>beast_extras</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt" />

modules/beast_asio/beast_asio.h

@@ -41,7 +41,7 @@
 #include "../beast_core/beast_core.h"
 
 // This module requires boost and possibly OpenSSL
-#include "system/beast_BoostIncludes.h"
+#include "system/BoostIncludes.h"
 
 // Checking overrides replaces unimplemented stubs with pure virtuals
 #ifndef BEAST_COMPILER_CHECKS_SOCKET_OVERRIDES

modules/beast_asio/sockets/beast_SocketWrapper.h

@@ -190,7 +190,7 @@ public:
     //
     // This include will be needed:
     //
-    // #include <boost/tti/has_type.hpp>
+    // boost/tti/has_type.hpp
     //
     //
     BOOST_TTI_HAS_TYPE(native_handle_type)

modules/beast_asio/system/BoostIncludes.h

@@ -38,8 +38,11 @@
 # endif
 #endif
 
-#include <boost/version.hpp>
+// Unfortunately, we use some boost detail elements
+//
+// https://svn.boost.org/trac/boost/ticket/9024
 
+#include <boost/version.hpp>
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
@@ -47,29 +50,9 @@
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>
 #include <boost/type_traits.hpp>
-
-// Unfortunately, we need to use some boost detail
-//
-// https://svn.boost.org/trac/boost/ticket/9024
-//
 #include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 
-// Not sure when handler_type was added but it's not in 1.48
-#ifndef BEAST_ASIO_HAS_HANDLER_TYPE
-# if BOOST_VERSION >= 105400
-#  define BEAST_ASIO_HAS_HANDLER_TYPE 1
-# else
-#  define BEAST_ASIO_HAS_HANDLER_TYPE 0
-# endif
-#endif
-#if BEAST_ASIO_HAS_HANDLER_TYPE
-# include <boost/asio/handler_type.hpp>
-# define BEAST_ASIO_HANDLER_TYPE(h, sig) BOOST_ASIO_HANDLER_TYPE(h, sig)
-#else
-# define BEAST_ASIO_HANDLER_TYPE(h, sig) h
-#endif
-
 // Continuation hooks added in 1.54.0
 #ifndef BEAST_ASIO_HAS_CONTINUATION_HOOKS
 # if BOOST_VERSION >= 105400
@@ -89,33 +72,10 @@
 # ifndef BEAST_ASIO_HAS_BUFFEREDHANDSHAKE
 #  define BEAST_ASIO_HAS_BUFFEREDHANDSHAKE 1
 # endif
-# ifndef BEAST_ASIO_HAS_FUTURE_RETURNS
-#  define BEAST_ASIO_HAS_FUTURE_RETURNS 1
-# endif
 #else
 # ifndef BEAST_ASIO_HAS_BUFFEREDHANDSHAKE
 #  define BEAST_ASIO_HAS_BUFFEREDHANDSHAKE 0
 # endif
-# ifndef BEAST_ASIO_HAS_FUTURE_RETURNS
-#  define BEAST_ASIO_HAS_FUTURE_RETURNS 0
-# endif
-#endif
-
-#if ! BEAST_ASIO_HAS_FUTURE_RETURNS
-# define BEAST_ASIO_INITFN_RESULT_TYPE(expr,val) void
-# define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(expr,val) void
-#else
-# define BEAST_ASIO_INITFN_RESULT_TYPE(expr,val) BOOST_ASIO_INITFN_RESULT_TYPE(expr,val)
-# if defined(GENERATING_DOCUMENTATION)
-#  define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \
-   void_or_deduced
-# elif defined(_MSC_VER) && (_MSC_VER < 1500)
-#  define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \
-   boost::asio::detail::async_result_type_helper<h, sig>::type
-# else
-#  define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \
-   boost::asio::async_result <boost::asio::handler_type<h, sig>::type>::type
-# endif
 #endif
 
 #endif

modules/beast_core/diagnostic/beast_LeakChecked.cpp

@@ -89,7 +89,11 @@ void LeakCheckedBase::CounterBase::checkForLeaks ()
 
 //------------------------------------------------------------------------------
 
+#if BEAST_DEBUG
 void LeakCheckedBase::reportDanglingPointer (char const* objectName)
+#else
+void LeakCheckedBase::reportDanglingPointer (char const*)
+#endif
 {
     /*  If you hit this, then you've managed to delete more instances
         of this class than you've created. That indicates that you're

modules/beast_core/system/BindIncludes.h

@@ -50,8 +50,7 @@
 #elif BEAST_BIND_USES_TR1
 # include <tr1/functional>
 #elif BEAST_BIND_USES_BOOST
-# include <boost/bind.hpp>
+// included in BoostIncludes.h
-# include <boost/function.hpp>
 #endif
 
 #endif

modules/beast_core/system/BoostIncludes.h

@@ -31,27 +31,39 @@
 #endif
 
 //------------------------------------------------------------------------------
+
 #if BEAST_BOOST_IS_AVAILABLE
 
+// Prevent <boost/bind/placeholders.hpp> from being included
+#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+# error "boost/bind.hpp must not be included before this file"
+#else
+# define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+#endif
+
+#include <boost/bind.hpp>
+#include <boost/bind/arg.hpp>
+#include <boost/config.hpp>
+#include <boost/function.hpp>
+#include <boost/thread/tss.hpp>         // for FifoFreeStoreWithTLS
 #include <boost/version.hpp>
+
 #if BOOST_VERSION > 105499
 # error "This hasnt been tested with boost versions above 1.54"
 #endif
 
-// Used for FifoFreeStoreWithTLS
+// This is a hack to fix boost's goofy placeholders going into the global
-#include <boost/thread/tss.hpp>
+// namespace. First we prevent the user from including boost/bind.hpp
-
+// before us. Then we define the include guard macro and include
-// This is a hack to fix boost's goofy placeholders
+// boost/bind.hpp ourselves to get the declarations. Finally we repeat
-#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+// the missing placeholder declarations but put them in a proper namespace.
-#error <boost/bind.hpp> must not be included before this file
+//
-#endif
+// We put the placeholders in boost::placeholders so they can be accessed
-
+// explicitly to handle the common case of a "using namespace oost" directive
-// Prevent <boost/bind/placeholders.hpp> from being included
+// being in effect.
-#define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
+//
-#include <boost/bind/arg.hpp>
+// Declarations based on boost/bind/placeholders.cpp
-#include <boost/config.hpp>
+//
-
-// This based on <boost/bind/placeholders.cpp>
 namespace boost {
 namespace placeholders {
 extern boost::arg<1> _1;
@@ -68,6 +80,7 @@ using namespace placeholders;
 }
 
 #endif
+
 //------------------------------------------------------------------------------
 
 #endif

modules/beast_extras/beast_extras.cpp

@@ -19,7 +19,7 @@
 
 #include "BeastConfig.h"
 
-#include "beast_boost.h"
+#include "beast_extras.h"
 
 namespace beast
 {

modules/beast_extras/beast_extras.h

@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_BOOST_H_INCLUDED
+#ifndef BEAST_EXTRAS_H_INCLUDED
-#define BEAST_BOOST_H_INCLUDED
+#define BEAST_EXTRAS_H_INCLUDED
 
 // Adds boost-specific features to beast.