Changes for Beast

src/ripple/app/main/Application.cpp

@@ -74,7 +74,7 @@
 #include <ripple/crypto/csprng.h>
 #include <ripple/beast/asio/io_latency_probe.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/signal_set.hpp>
 #include <boost/optional.hpp>
 #include <fstream>

src/ripple/app/main/Main.cpp

@@ -40,7 +40,7 @@
 #include <ripple/beast/core/Time.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/Debug.h>
-#include <beast/detail/stream/debug_ostream.hpp>
+#include <beast/unit_test/debug_ostream.hpp>
 #include <google/protobuf/stubs/common.h>
 #include <boost/program_options.hpp>
 #include <cstdlib>
@@ -201,7 +201,7 @@ static int runUnitTests(
     std::string const& argument)
 {
     using namespace beast::unit_test;
-    beast::detail::debug_ostream stream;
+    beast::debug_ostream stream;
     reporter r (stream);
     r.arg(argument);
     bool const failed (r.run_each_if (

src/ripple/app/tests/DeliverMin.test.cpp

@@ -114,7 +114,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(DeliverMin,app,ripple)
+BEAST_DEFINE_TESTSUITE(DeliverMin,app,ripple);
 
 } // test
 } // ripple

src/ripple/app/tests/HashRouter_test.cpp

@@ -225,7 +225,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(HashRouter, app, ripple)
+BEAST_DEFINE_TESTSUITE(HashRouter, app, ripple);
 
 }
 }

src/ripple/app/tests/Offer.test.cpp

@@ -810,7 +810,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE (Offer, tx, ripple)
+BEAST_DEFINE_TESTSUITE (Offer, tx, ripple);
 
 }  // test
 }  // ripple

src/ripple/app/tests/Path_test.cpp

@@ -863,7 +863,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(Path,app,ripple)
+BEAST_DEFINE_TESTSUITE(Path,app,ripple);
 
 } // test
 } // ripple

src/ripple/basics/BasicConfig.h

@@ -21,8 +21,8 @@
 #define RIPPLE_BASICS_BASICCONFIG_H_INCLUDED
 
 #include <ripple/basics/contract.h>
-#include <beast/detail/const_container.hpp>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/unit_test/detail/const_container.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional.hpp>
 #include <map>
@@ -40,7 +40,7 @@ using IniFileSections = std::map<std::string, std::vector<std::string>>;
     A configuration file contains zero or more sections.
 */
 class Section
-    : public beast::detail::const_container <
+    : public beast::unit_test::detail::const_container <
         std::map <std::string, std::string, beast::detail::ci_less>>
 {
 private:

src/ripple/basics/Log.h

@@ -21,7 +21,7 @@
 #define RIPPLE_BASICS_LOG_H_INCLUDED
 
 #include <ripple/basics/UnorderedContainers.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/filesystem.hpp>
 #include <map>

src/ripple/basics/impl/ResolverAsio.cpp

@@ -21,7 +21,7 @@
 #include <ripple/basics/ResolverAsio.h>
 #include <ripple/basics/Log.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/WaitableEvent.h>
 #include <boost/asio.hpp>
 #include <atomic>

src/ripple/basics/random.h

@@ -22,7 +22,7 @@
 
 #include <ripple/basics/win32_workaround.h>
 #include <ripple/beast/xor_shift_engine.h>
-#include <beast/detail/is_call_possible.hpp>
+#include <beast/core/detail/is_call_possible.hpp>
 #include <boost/thread/tss.hpp>
 #include <cassert>
 #include <cstddef>

src/ripple/beast/container/detail/aged_ordered_container.h

@@ -24,7 +24,7 @@
 #include <ripple/beast/container/detail/aged_associative_container.h>
 #include <ripple/beast/container/aged_container.h>
 #include <ripple/beast/clock/abstract_clock.h>
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/version.hpp>

src/ripple/beast/container/detail/aged_unordered_container.h

@@ -24,7 +24,7 @@
 #include <ripple/beast/container/detail/aged_associative_container.h>
 #include <ripple/beast/container/aged_container.h>
 #include <ripple/beast/clock/abstract_clock.h>
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <algorithm>

src/ripple/beast/define_print.cpp

@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <beast/unit_test/amount.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/suite.hpp>
+#include <string>
+
+// Include this .cpp in your project to gain access to the printing suite
+
+namespace beast {
+namespace unit_test {
+
+/** A suite that prints the list of globally defined suites. */
+class print_test : public suite
+{
+private:
+    template <class = void>
+    void
+    do_run();
+
+public:
+    template <class = void>
+    static
+    std::string
+    prefix (suite_info const& s);
+
+    template <class = void>
+    void
+    print (suite_list const& c);
+
+    void
+    run()
+    {
+        do_run();
+    }
+};
+
+template <class>
+void
+print_test::do_run()
+{
+    log << "------------------------------------------";
+    print (global_suites());
+    log << "------------------------------------------";
+    pass();
+}
+
+template <class>
+std::string
+print_test::prefix (suite_info const& s)
+{
+    if (s.manual())
+        return "|M| ";
+    return "    ";
+}
+
+template <class>
+void
+print_test::print (suite_list const& c)
+{
+    std::size_t manual (0);
+    for (auto const& s : c)
+    {
+        log <<
+            prefix (s) <<
+            s.full_name();
+        if (s.manual())
+            ++manual;
+    }
+    log <<
+        amount (c.size(), "suite") << " total, " <<
+        amount (manual, "manual suite")
+        ;
+}
+
+BEAST_DEFINE_TESTSUITE_MANUAL(print,unit_test,beast);
+
+} // unit_test
+} // beast

src/ripple/beast/insight/impl/StatsDCollector.cpp

@@ -24,7 +24,7 @@
 #include <ripple/beast/insight/GaugeImpl.h>
 #include <ripple/beast/insight/MeterImpl.h>
 #include <ripple/beast/insight/StatsDCollector.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/List.h>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/optional.hpp>

src/ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp

@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/beast/nudb/test/common.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
 #include <cmath>

src/ripple/beast/nudb/test/beast_nudb_recover_test.cpp

@@ -20,7 +20,7 @@
 #include <ripple/beast/nudb/test/common.h>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <cmath>
 #include <cstring>
 #include <memory>

src/ripple/beast/nudb/test/beast_nudb_store_test.cpp

@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <ripple/beast/nudb/test/common.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
 #include <cmath>

src/ripple/beast/unit_test.h

@@ -20,22 +20,16 @@
 #ifndef BEAST_UNIT_TEST_H_INCLUDED
 #define BEAST_UNIT_TEST_H_INCLUDED
 
-#include <beast/detail/unit_test/amount.hpp>
-#include <beast/detail/unit_test/print.hpp>
-#include <beast/detail/unit_test/global_suites.hpp>
-#include <beast/detail/unit_test/match.hpp>
-#include <beast/detail/unit_test/recorder.hpp>
-#include <beast/detail/unit_test/reporter.hpp>
-#include <beast/detail/unit_test/results.hpp>
-#include <beast/detail/unit_test/runner.hpp>
-#include <beast/detail/unit_test/suite.hpp>
-#include <beast/detail/unit_test/suite_info.hpp>
-#include <beast/detail/unit_test/suite_list.hpp>
-
-namespace beast {
-namespace unit_test {
-using namespace beast::detail::unit_test;
-} // unit_test
-} // beast
+#include <beast/unit_test/amount.hpp>
+#include <beast/unit_test/print.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/match.hpp>
+#include <beast/unit_test/recorder.hpp>
+#include <beast/unit_test/reporter.hpp>
+#include <beast/unit_test/results.hpp>
+#include <beast/unit_test/runner.hpp>
+#include <beast/unit_test/suite.hpp>
+#include <beast/unit_test/suite_info.hpp>
+#include <beast/unit_test/suite_list.hpp>
 
 #endif

src/ripple/beast/utility/weak_fn.h

@@ -20,7 +20,7 @@
 #ifndef BEAST_WEAK_FN_H_INCLUDED
 #define BEAST_WEAK_FN_H_INCLUDED
 
-#include <beast/detail/empty_base_optimization.hpp>
+#include <beast/core/detail/empty_base_optimization.hpp>
 #include <memory>
 
 // Original version:

src/ripple/core/Config.h

@@ -27,7 +27,7 @@
 #include <ripple/protocol/SecretKey.h> // NIKB Breaks levelization (TEMP)
 #include <ripple/json/json_value.h>
 #include <ripple/beast/net/IPEndpoint.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/Journal.h>
 #include <boost/asio/ip/tcp.hpp> // VFALCO FIX: This include should not be here
 #include <boost/filesystem.hpp> // VFALCO FIX: This include should not be here

src/ripple/core/impl/Config.cpp

@@ -27,7 +27,7 @@
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/net/HTTPClient.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 #include <boost/regex.hpp>

src/ripple/core/impl/SNTPClock.cpp

@@ -22,7 +22,7 @@
 #include <ripple/basics/ThreadName.h>
 #include <ripple/basics/random.h>
 #include <ripple/core/impl/SNTPClock.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/Thread.h>
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>

src/ripple/ledger/tests/View_test.cpp

@@ -974,7 +974,7 @@ class DirIsEmpty_test
 
 BEAST_DEFINE_TESTSUITE(View,ledger,ripple);
 BEAST_DEFINE_TESTSUITE(GetAmendments,ledger,ripple);
-BEAST_DEFINE_TESTSUITE(DirIsEmpty, ledger,ripple)
+BEAST_DEFINE_TESTSUITE(DirIsEmpty, ledger,ripple);
 
 }  // test
 }  // ripple

src/ripple/net/impl/HTTPClient.cpp

@@ -23,7 +23,7 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/net/HTTPClient.h>
 #include <ripple/websocket/AutoSocket.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>

src/ripple/net/impl/RPCCall.cpp

@@ -35,7 +35,7 @@
 #include <ripple/protocol/types.h>
 #include <ripple/server/ServerHandler.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <boost/regex.hpp>
 #include <iostream>

src/ripple/nodestore/backend/MemoryFactory.cpp

@@ -21,7 +21,7 @@
 #include <ripple/basics/contract.h>
 #include <ripple/nodestore/Factory.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <map>
 #include <memory>
 #include <mutex>

src/ripple/nodestore/impl/ManagerImp.cpp

@@ -23,7 +23,7 @@
 #include <ripple/nodestore/impl/DatabaseImp.h>
 #include <ripple/nodestore/impl/DatabaseRotatingImp.h>
 #include <ripple/basics/StringUtilities.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <memory>
 #include <stdexcept>
 

src/ripple/nodestore/tests/Backend.test.cpp

@@ -21,7 +21,7 @@
 #include <ripple/nodestore/tests/Base.test.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <algorithm>
 
 namespace ripple {

src/ripple/nodestore/tests/Database.test.cpp

@@ -21,7 +21,7 @@
 #include <ripple/nodestore/tests/Base.test.h>
 #include <ripple/nodestore/DummyScheduler.h>
 #include <ripple/nodestore/Manager.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <algorithm>
 
 namespace ripple {

src/ripple/nodestore/tests/Timing.test.cpp

@@ -23,10 +23,10 @@
 #include <ripple/nodestore/Manager.h>
 #include <ripple/basics/BasicConfig.h>
 #include <ripple/unity/rocksdb.h>
-#include <beast/detail/temp_dir.hpp>
+#include <beast/core/detail/temp_dir.hpp>
 #include <ripple/beast/xor_shift_engine.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/unit_test/thread.hpp>
+#include <beast/unit_test/thread.hpp>
 #include <boost/algorithm/string.hpp>
 #include <atomic>
 #include <chrono>

src/ripple/nodestore/tests/import_test.cpp

@@ -26,7 +26,7 @@
 #include <ripple/beast/nudb/create.h>
 #include <ripple/beast/nudb/detail/format.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/regex.hpp>
 #include <algorithm>
 #include <chrono>

src/ripple/overlay/impl/ConnectAttempt.cpp

@@ -23,9 +23,9 @@
 #include <ripple/overlay/impl/PeerImp.h>
 #include <ripple/overlay/impl/Tuning.h>
 #include <ripple/json/json_reader.h>
+#include <beast/core/to_string.hpp>
 #include <beast/http/read.hpp>
 #include <beast/http/write.hpp>
-#include <beast/to_string.hpp>
 
 namespace ripple {
 

src/ripple/overlay/impl/ConnectAttempt.h

@@ -31,8 +31,8 @@
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <ripple/beast/net/IPAddressConversion.h>
 #include <ripple/beast/utility/WrappedSink.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/empty_body.hpp>
 #include <beast/http/parser_v1.hpp>

src/ripple/overlay/impl/OverlayImpl.cpp

@@ -35,11 +35,11 @@
 #include <ripple/peerfinder/make_Manager.h>
 #include <ripple/protocol/STExchange.h>
 #include <ripple/beast/core/ByteOrder.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <beast/http.hpp>
 #include <beast/http/rfc2616.hpp>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <ripple/beast/utility/WrappedSink.h>
 
 #include <boost/utility/in_place_factory.hpp>

src/ripple/overlay/impl/PeerImp.h

@@ -36,8 +36,8 @@
 #include <ripple/protocol/STValidation.h>
 #include <ripple/beast/core/ByteOrder.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <beast/http/message.hpp>
 #include <beast/http/parser_v1.hpp>

src/ripple/overlay/impl/PeerSet.cpp

@@ -22,7 +22,7 @@
 #include <ripple/overlay/PeerSet.h>
 #include <ripple/core/JobQueue.h>
 #include <ripple/overlay/Overlay.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 
 namespace ripple {
 

src/ripple/overlay/impl/TMHello.cpp

@@ -25,7 +25,7 @@
 #include <ripple/protocol/digest.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/overlay/impl/TMHello.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <beast/http/rfc2616.hpp>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/regex.hpp>

src/ripple/overlay/tests/short_read.test.cpp

@@ -19,7 +19,7 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/make_SSLContext.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/unit_test.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>

src/ripple/peerfinder/impl/Checker.h

@@ -21,7 +21,7 @@
 #define RIPPLE_PEERFINDER_CHECKER_H_INCLUDED
 
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <boost/asio/detail/handler_invoke_helpers.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>

src/ripple/server/Port.h

@@ -22,7 +22,7 @@
 
 #include <ripple/basics/BasicConfig.h>
 #include <ripple/beast/net/IPEndpoint.h>
-#include <beast/detail/ci_char_traits.hpp>
+#include <beast/core/detail/ci_char_traits.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <cstdint>
 #include <memory>

src/ripple/server/SimpleWriter.h

@@ -21,10 +21,10 @@
 #define RIPPLE_SERVER_SIMPLEWRITER_H_INCLUDED
 
 #include <ripple/server/Writer.h>
+#include <beast/core/streambuf.hpp>
+#include <beast/core/write_streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <beast/http/write.hpp>
-#include <beast/streambuf.hpp>
-#include <beast/write_streambuf.hpp>
 #include <utility>
 
 namespace ripple {

src/ripple/server/impl/BaseHTTPPeer.h

@@ -26,7 +26,7 @@
 #include <ripple/server/impl/io_list.h>
 #include <ripple/server/impl/ServerImpl.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/asio/ssl_error.h> // for is_short_read?
 #include <beast/http/read.hpp>
 #include <beast/http/message.hpp>

src/ripple/server/impl/BaseWSPeer.h

@@ -23,7 +23,7 @@
 #include <ripple/server/impl/BasePeer.h>
 #include <ripple/protocol/BuildInfo.h>
 #include <beast/websocket.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/message_v1.hpp>
 #include <cassert>
 

src/ripple/server/impl/Door.cpp

@@ -24,7 +24,7 @@
 #include <ripple/server/impl/PlainHTTPPeer.h>
 #include <ripple/server/impl/SSLHTTPPeer.h>
 #include <boost/asio/buffer.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <ripple/beast/asio/ssl_bundle.h>
 #include <functional>
 

src/ripple/server/impl/Door.h

@@ -22,7 +22,7 @@
 
 #include <ripple/server/impl/io_list.h>
 #include <ripple/server/impl/ServerImpl.h>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>

src/ripple/server/impl/SSLWSPeer.h

@@ -23,7 +23,7 @@
 #include <ripple/server/impl/BaseHTTPPeer.h>
 #include <ripple/server/WSSession.h>
 #include <ripple/beast/asio/ssl_bundle.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <beast/websocket/ssl.hpp>
 #include <memory>
 

src/ripple/server/impl/ServerHandlerImp.cpp

@@ -38,7 +38,7 @@
 #include <ripple/resource/Fees.h>
 #include <ripple/rpc/impl/Tuning.h>
 #include <ripple/rpc/RPCHandler.h>
-#include <beast/detail/base64.hpp>
+#include <beast/core/detail/base64.hpp>
 #include <beast/http/headers.hpp>
 #include <beast/http/rfc2616.hpp>
 #include <boost/algorithm/string.hpp>

src/ripple/server/json_body.h

@@ -21,7 +21,7 @@
 #define RIPPLE_SERVER_JSON_BODY_H
 
 #include <ripple/json/json_value.h>
-#include <beast/streambuf.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/http/body_type.hpp>
 
 namespace ripple {
@@ -50,7 +50,7 @@ struct json_body
         }
 
         void
-        init(beast::http::error_code&)
+        init(beast::error_code&)
         {
         }
 
@@ -63,7 +63,7 @@ struct json_body
         template<class Write>
         boost::tribool
         operator()(beast::http::resume_context&&,
-            beast::http::error_code&, Write&& write)
+            beast::error_code&, Write&& write)
         {
             write(sb_.data());
             return true;

src/ripple/test/impl/BasicNetwork_test.cpp

@@ -126,7 +126,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(BasicNetwork, test, ripple)
+BEAST_DEFINE_TESTSUITE(BasicNetwork, test, ripple);
 
 } // test
 } // ripple

src/ripple/test/impl/WSClient.cpp

@@ -24,8 +24,8 @@
 #include <ripple/json/to_string.h>
 #include <ripple/protocol/JsonFields.h>
 #include <ripple/server/Port.h>
-#include <beast/placeholders.hpp>
-#include <beast/streambuf.hpp>
+#include <beast/core/placeholders.hpp>
+#include <beast/core/streambuf.hpp>
 #include <beast/websocket.hpp>
 #include <condition_variable>
 

src/ripple/test/impl/WSClient_test.cpp

@@ -21,7 +21,7 @@
 #include <ripple/test/WSClient.h>
 #include <ripple/test/jtx.h>
 #include <ripple/beast/unit_test.h>
-#include <beast/handler_alloc.hpp>
+#include <beast/core/handler_alloc.hpp>
 
 namespace ripple {
 namespace test {

src/ripple/test/jtx/Env.h

@@ -42,7 +42,7 @@
 #include <ripple/protocol/STAmount.h>
 #include <ripple/protocol/STObject.h>
 #include <ripple/protocol/STTx.h>
-#include <beast/detail/is_call_possible.hpp>
+#include <beast/core/detail/is_call_possible.hpp>
 #include <ripple/beast/unit_test.h>
 #include <functional>
 #include <string>

src/ripple/test/jtx/impl/Env_test.cpp

@@ -601,7 +601,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(Env,app,ripple)
+BEAST_DEFINE_TESTSUITE(Env,app,ripple);
 
 } // test
 } // ripple

src/ripple/unity/beast.cpp

@@ -22,6 +22,6 @@
 // MUST come first!
 #include <BeastConfig.h>
 #include <ripple/beast/core/core.unity.cpp>
-#include <beast/detail/unit_test/define_print.cpp>
+#include <ripple/beast/define_print.cpp>
 
 #endif

src/ripple/websocket/AutoSocket.h

@@ -22,8 +22,8 @@
 
 #include <ripple/basics/Log.h>
 #include <ripple/beast/net/IPAddressConversion.h>
-#include <beast/bind_handler.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/bind_handler.hpp>
+#include <beast/core/placeholders.hpp>
 #include <boost/asio.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>

src/ripple/websocket/Connection.h

@@ -41,7 +41,7 @@
 #include <ripple/websocket/WebSocket.h>
 
 #include <boost/asio.hpp>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <memory>
 
 namespace ripple {

src/websocketpp_02/src/sockets/autotls.hpp

@@ -29,7 +29,7 @@
 #define WEBSOCKETPP_SOCKET_AUTOTLS_HPP
 
 #include <ripple/websocket/AutoSocket.h>
-#include <beast/placeholders.hpp>
+#include <beast/core/placeholders.hpp>
 #include <functional>
 
 // Note that AutoSocket.h must be included before this file