Roll back 7 commits

Subtrees/beast/modules/beast_basics/beast_basics.h

@@ -222,12 +222,12 @@
 
   @todo Discuss the treatment of exceptions versus Error objects in the library.
 
-  @todo Discuss the additions to BeastConfig.h
+  @todo Discuss the additions to AppConfig.h
 
   @defgroup beast_core beast_core
 */
 
-/*  See the JUCE notes regarding BeastConfig.h
+/*  See the Juce notes regarding AppConfig.h
 
     This file must always be included before any Juce headers.
 
@@ -238,7 +238,7 @@
 /* BeastConfig.h must be included before this file */
 
 /* Use sensible default configurations if they forgot
-   to append the necessary macros into their BeastConfig.h.
+   to append the necessary macros into their AppConfig.h.
 */
 #ifndef BEAST_USE_BOOST
 #define BEAST_USE_BOOST 0
@@ -286,57 +286,6 @@
 
 //------------------------------------------------------------------------------
 
-// This is a hack to fix boost's goofy placeholders
-#if BEAST_USE_BOOST
-#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 is from <boost/bind/placeholders.cpp>
-namespace boost {
-namespace placeholders {
-#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ < 4)
-static inline boost::arg<1> _1() { return boost::arg<1>(); }
-static inline boost::arg<2> _2() { return boost::arg<2>(); }
-static inline boost::arg<3> _3() { return boost::arg<3>(); }
-static inline boost::arg<4> _4() { return boost::arg<4>(); }
-static inline boost::arg<5> _5() { return boost::arg<5>(); }
-static inline boost::arg<6> _6() { return boost::arg<6>(); }
-static inline boost::arg<7> _7() { return boost::arg<7>(); }
-static inline boost::arg<8> _8() { return boost::arg<8>(); }
-static inline boost::arg<9> _9() { return boost::arg<9>(); }
-#elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__) || \
-    defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 2)  
-static boost::arg<1> _1;
-static boost::arg<2> _2;
-static boost::arg<3> _3;
-static boost::arg<4> _4;
-static boost::arg<5> _5;
-static boost::arg<6> _6;
-static boost::arg<7> _7;
-static boost::arg<8> _8;
-static boost::arg<9> _9;
-#else
-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
-}
-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

Subtrees/beast/modules/beast_basics/functor/beast_Bind.h

@@ -20,17 +20,7 @@
 #ifndef BEAST_BIND_BEASTHEADER
 #define BEAST_BIND_BEASTHEADER
 
-// VFALCO TODO Rename this file to beast_Functional.h
-
-/*  Brings functional support into our namespace, based on environment.
-
-    Notes on bind
-
-    Difference between boost::bind and std::bind
-    http://stackoverflow.com/questions/10555566/is-there-any-difference-between-c11-stdbind-and-boostbind
-
-    Resolving conflict between boost::shared_ptr and std::shared_ptr
-    http://stackoverflow.com/questions/4682343/how-to-resolve-conflict-between-boostshared-ptr-and-using-stdshared-ptr
+/* Brings functional support into our namespace, based on environment.
 */
 
 #ifndef BEAST_BIND_PLACEHOLDERS_N
@@ -58,7 +48,6 @@
 #if BEAST_BIND_USES_STD
 
 using std::ref;
-using std::cref;
 using std::bind;
 using std::function;
 
@@ -147,7 +136,6 @@ using std::placeholders::_20;
 #elif BEAST_BIND_USES_TR1
 
 using std::tr1::ref;
-using std::tr1::cref;
 using std::tr1::bind;
 using std::tr1::function;
 
@@ -236,7 +224,6 @@ using std::tr1::placeholders::_20;
 #elif BEAST_BIND_USES_BOOST
 
 using boost::ref;
-using boost::cref;
 using boost::bind;
 using boost::function;
 

Subtrees/websocket/src/roles/server.hpp

@@ -551,13 +551,10 @@ void server<endpoint>::connection<connection_type>::async_init() {
     m_connection.register_timeout(5000,fail::status::TIMEOUT_WS,
                                        "Timeout on WebSocket handshake");
 
-    static boost::arg<1> pl1;
-    static boost::arg<2> pl2;
-
 	boost::shared_ptr<std::string> stringPtr = boost::make_shared<std::string>();
 	m_connection.get_socket().async_read_until(
 		m_connection.buffer(),
-		boost::bind(&match_header, stringPtr, pl1, pl2),
+		boost::bind(&match_header, stringPtr, _1, _2),
 		m_connection.get_strand().wrap(boost::bind(
 			&type::handle_read_request,
 			m_connection.shared_from_this(),