From 560071bb683bf4a863a3c2f28e627d456ab7aed6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 29 May 2014 11:59:36 -0700 Subject: [PATCH] Make all include paths relative to a root directory: * Better include path support in the VSProject scons tool. * Various manual fixes to include paths. --- Builds/VisualStudio2013/RippleD.vcxproj | 78 +- .../VisualStudio2013/RippleD.vcxproj.filters | 3 - SConstruct | 3 +- src/beast/Builds/VisualStudio2013/Beast.props | 6 +- src/beast/beast/Arithmetic.h | 4 +- src/beast/beast/Atomic.h | 6 +- src/beast/beast/Boost.h | 2 +- src/beast/beast/ByteOrder.h | 4 +- src/beast/beast/Chrono.h | 14 +- src/beast/beast/Config.h | 18 +- src/beast/beast/Crypto.h | 10 +- src/beast/beast/HeapBlock.h | 4 +- src/beast/beast/Insight.h | 26 +- src/beast/beast/Intrusive.h | 4 +- src/beast/beast/Memory.h | 4 +- src/beast/beast/SmartPtr.h | 10 +- src/beast/beast/Strings.h | 4 +- src/beast/beast/Threads.h | 26 +- src/beast/beast/asio/Asio.unity.cpp | 14 +- src/beast/beast/asio/IPAddressConversion.h | 2 +- src/beast/beast/asio/abstract_socket.cpp | 4 +- src/beast/beast/asio/abstract_socket.h | 4 +- src/beast/beast/asio/bind_handler.h | 4 +- src/beast/beast/asio/buffer_sequence.h | 4 +- src/beast/beast/asio/enable_wait_for_async.h | 6 +- .../beast/asio/impl/IPAddressConversion.cpp | 2 +- src/beast/beast/asio/memory_buffer.h | 4 +- src/beast/beast/asio/shared_handler.h | 8 +- src/beast/beast/asio/socket_wrapper.h | 6 +- .../beast/asio/tests/bind_handler.test.cpp | 6 +- .../asio/tests/enable_wait_for_async.test.cpp | 8 +- .../beast/asio/tests/shared_handler.test.cpp | 6 +- .../beast/asio/tests/wrap_handler.test.cpp | 6 +- src/beast/beast/asio/wrap_handler.h | 2 +- src/beast/beast/boost/Boost.unity.cpp | 4 +- src/beast/beast/chrono/Chrono.unity.cpp | 12 +- src/beast/beast/chrono/RelativeTime.h | 6 +- src/beast/beast/chrono/abstract_clock_io.h | 2 +- src/beast/beast/chrono/basic_seconds_clock.h | 18 +- src/beast/beast/chrono/chrono_io.h | 6 +- src/beast/beast/chrono/impl/RelativeTime.cpp | 2 +- src/beast/beast/chrono/impl/chrono_io.cpp | 2 +- src/beast/beast/chrono/manual_clock.h | 2 +- .../chrono/tests/abstract_clock.test.cpp | 8 +- .../chrono/tests/basic_seconds_clock.test.cpp | 4 +- src/beast/beast/config/CompilerConfig.h | 2 +- src/beast/beast/config/StandardConfig.h | 16 +- src/beast/beast/config/compiler/VisualC.h | 2 +- src/beast/beast/container/Container.unity.cpp | 12 +- .../beast/container/aged_container_utility.h | 2 +- src/beast/beast/container/aged_map.h | 2 +- src/beast/beast/container/aged_multimap.h | 2 +- src/beast/beast/container/aged_multiset.h | 2 +- src/beast/beast/container/aged_set.h | 2 +- .../beast/container/aged_unordered_map.h | 2 +- .../beast/container/aged_unordered_multimap.h | 2 +- .../beast/container/aged_unordered_multiset.h | 2 +- .../beast/container/aged_unordered_set.h | 2 +- src/beast/beast/container/buffer_view.h | 6 +- .../container/detail/aged_ordered_container.h | 14 +- .../detail/aged_unordered_container.h | 14 +- src/beast/beast/container/hardened_hash.h | 8 +- src/beast/beast/container/hash_append.h | 10 +- src/beast/beast/container/impl/spookyv2.cpp | 2 +- src/beast/beast/container/impl/spookyv2.h | 2 +- .../tests/aged_associative_container.test.cpp | 20 +- .../container/tests/buffer_view.test.cpp | 6 +- .../container/tests/hardened_hash.test.cpp | 8 +- .../container/tests/hash_append.test.cpp | 14 +- src/beast/beast/crypto/Crypto.unity.cpp | 12 +- src/beast/beast/crypto/Sha256.h | 2 +- src/beast/beast/crypto/UnsignedInteger.h | 10 +- src/beast/beast/crypto/UnsignedIntegerCalc.h | 2 +- src/beast/beast/crypto/impl/MurmurHash.cpp | 2 +- src/beast/beast/crypto/impl/Sha256.cpp | 4 +- .../beast/crypto/impl/UnsignedInteger.cpp | 4 +- .../beast/crypto/tests/BinaryEncoding.cpp | 8 +- .../crypto/tests/UnsignedInteger.test.cpp | 4 +- src/beast/beast/cxx14/algorithm.h | 4 +- src/beast/beast/cxx14/cxx14.unity.cpp | 2 +- src/beast/beast/cxx14/functional.h | 2 +- src/beast/beast/cxx14/iterator.h | 2 +- src/beast/beast/cxx14/memory.h | 2 +- .../cxx14/tests/integer_sequence.test.cpp | 6 +- src/beast/beast/cxx14/type_traits.h | 2 +- src/beast/beast/cxx14/utility.h | 2 +- src/beast/beast/http/HTTP.unity.cpp | 22 +- src/beast/beast/http/ParsedURL.h | 4 +- src/beast/beast/http/URL.h | 2 +- src/beast/beast/http/basic_url.h | 2 +- src/beast/beast/http/client_session.h | 22 +- src/beast/beast/http/detail/header_traits.h | 2 +- src/beast/beast/http/impl/ParsedURL.cpp | 6 +- src/beast/beast/http/impl/URL.cpp | 2 +- src/beast/beast/http/impl/basic_url.cpp | 4 +- src/beast/beast/http/impl/get.cpp | 4 +- src/beast/beast/http/impl/joyent_parser.cpp | 6 +- src/beast/beast/http/impl/joyent_parser.h | 4 +- src/beast/beast/http/impl/raw_parser.cpp | 4 +- src/beast/beast/http/raw_parser.h | 2 +- src/beast/beast/http/tests/ParsedURL.cpp | 6 +- .../beast/http/tests/basic_message.test.cpp | 2 +- src/beast/beast/http/tests/basic_url.test.cpp | 4 +- .../beast/http/tests/client_session.test.cpp | 14 +- .../beast/http/tests/urls_large_data.cpp | 2 +- src/beast/beast/insight/Collector.h | 10 +- src/beast/beast/insight/Counter.h | 4 +- src/beast/beast/insight/CounterImpl.h | 2 +- src/beast/beast/insight/Event.h | 6 +- src/beast/beast/insight/EventImpl.h | 2 +- src/beast/beast/insight/Gauge.h | 4 +- src/beast/beast/insight/GaugeImpl.h | 2 +- src/beast/beast/insight/Group.h | 2 +- src/beast/beast/insight/Groups.h | 4 +- src/beast/beast/insight/Hook.h | 4 +- src/beast/beast/insight/HookImpl.h | 2 +- src/beast/beast/insight/Insight.unity.cpp | 20 +- src/beast/beast/insight/Meter.h | 4 +- src/beast/beast/insight/MeterImpl.h | 2 +- src/beast/beast/insight/NullCollector.h | 2 +- src/beast/beast/insight/StatsDCollector.h | 6 +- src/beast/beast/insight/impl/Groups.cpp | 2 +- .../beast/insight/impl/StatsDCollector.cpp | 6 +- src/beast/beast/intrusive/List.h | 4 +- src/beast/beast/intrusive/LockFreeStack.h | 4 +- src/beast/beast/net/IPAddress.h | 6 +- src/beast/beast/net/IPAddressV4.h | 2 +- src/beast/beast/net/IPEndpoint.h | 4 +- src/beast/beast/net/Net.unity.cpp | 12 +- src/beast/beast/net/impl/DynamicBuffer.cpp | 2 +- src/beast/beast/net/impl/IPAddressV4.cpp | 4 +- src/beast/beast/net/impl/IPAddressV6.cpp | 2 +- src/beast/beast/net/impl/IPEndpoint.cpp | 4 +- src/beast/beast/net/tests/IPEndpoint.test.cpp | 6 +- src/beast/beast/smart_ptr/ScopedPointer.h | 8 +- src/beast/beast/smart_ptr/SharedObject.h | 4 +- src/beast/beast/smart_ptr/SharedPtr.h | 4 +- src/beast/beast/streams/abstract_ostream.h | 2 +- .../beast/streams/basic_abstract_ostream.h | 2 +- .../beast/streams/basic_scoped_ostream.h | 2 +- src/beast/beast/streams/basic_std_ostream.h | 2 +- src/beast/beast/streams/debug_ostream.h | 6 +- src/beast/beast/streams/streams.unity.cpp | 2 +- .../tests/basic_abstract_ostream.test.cpp | 4 +- src/beast/beast/strings/CharPointer_ASCII.h | 4 +- src/beast/beast/strings/CharPointer_UTF16.h | 6 +- src/beast/beast/strings/CharPointer_UTF32.h | 6 +- src/beast/beast/strings/CharPointer_UTF8.h | 6 +- src/beast/beast/strings/CharacterFunctions.h | 4 +- src/beast/beast/strings/NewLine.h | 4 +- src/beast/beast/strings/String.h | 20 +- .../beast/strings/StringCharPointerType.h | 8 +- src/beast/beast/strings/StringFromNumber.h | 6 +- src/beast/beast/strings/Strings.unity.cpp | 4 +- .../beast/strings/impl/CharacterFunctions.cpp | 2 +- src/beast/beast/strings/impl/String.cpp | 14 +- src/beast/beast/threads/RecursiveMutex.h | 6 +- src/beast/beast/threads/ServiceQueue.h | 10 +- src/beast/beast/threads/SharedData.h | 4 +- src/beast/beast/threads/SharedLockGuard.h | 2 +- src/beast/beast/threads/SharedMutexAdapter.h | 2 +- src/beast/beast/threads/SpinLock.h | 4 +- src/beast/beast/threads/Stoppable.h | 8 +- src/beast/beast/threads/Thread.h | 8 +- src/beast/beast/threads/ThreadLocalValue.h | 6 +- src/beast/beast/threads/Threads.unity.cpp | 16 +- src/beast/beast/threads/TryLockGuard.h | 2 +- src/beast/beast/threads/UnlockGuard.h | 2 +- src/beast/beast/threads/WaitableEvent.h | 4 +- .../beast/threads/detail/DispatchedHandler.h | 2 +- .../beast/threads/impl/RecursiveMutex.cpp | 10 +- src/beast/beast/threads/impl/ServiceQueue.cpp | 2 +- src/beast/beast/threads/impl/Stoppable.cpp | 2 +- src/beast/beast/threads/impl/Thread.cpp | 12 +- .../beast/threads/impl/WaitableEvent.cpp | 2 +- src/beast/beast/threads/tests/Atomic.test.cpp | 8 +- .../beast/threads/tests/ServiceQueue.cpp | 8 +- src/beast/beast/unit_test.h | 22 +- src/beast/beast/unit_test/define_print.cpp | 6 +- src/beast/beast/unit_test/global_suites.h | 2 +- src/beast/beast/unit_test/match.h | 2 +- src/beast/beast/unit_test/print.h | 8 +- src/beast/beast/unit_test/recorder.h | 4 +- src/beast/beast/unit_test/reporter.h | 8 +- src/beast/beast/unit_test/results.h | 2 +- src/beast/beast/unit_test/runner.h | 4 +- src/beast/beast/unit_test/suite.h | 6 +- src/beast/beast/unit_test/suite_list.h | 4 +- src/beast/beast/unit_test/tests/main.cpp | 8 +- src/beast/beast/utility/Debug.h | 2 +- src/beast/beast/utility/Error.h | 4 +- src/beast/beast/utility/LeakChecked.h | 8 +- src/beast/beast/utility/PropertyStream.h | 6 +- src/beast/beast/utility/Utility.unity.cpp | 22 +- src/beast/beast/utility/Zero.h | 2 +- .../beast/utility/empty_base_optimization.h | 2 +- src/beast/beast/utility/impl/Debug.cpp | 6 +- src/beast/beast/utility/impl/Error.cpp | 4 +- src/beast/beast/utility/impl/Journal.cpp | 4 +- src/beast/beast/utility/impl/LeakChecked.cpp | 4 +- .../beast/utility/impl/PropertyStream.cpp | 4 +- src/beast/beast/utility/impl/StaticObject.cpp | 4 +- src/beast/beast/utility/is_call_possible.h | 2 +- src/beast/beast/utility/tagged_integer.h | 4 +- src/beast/beast/utility/tests/Zero.test.cpp | 4 +- .../beast/utility/tests/bassert.test.cpp | 4 +- .../tests/empty_base_optimization.test.cpp | 6 +- .../utility/tests/tagged_integer.test.cpp | 6 +- src/beast/beast/utility/type_name.h | 2 +- .../beast_asio/basics/FixedInputBuffer.h | 2 +- src/beast/modules/beast_asio/beast_asio.h | 78 +- .../modules/beast_asio/beast_asio.unity.cpp | 54 +- .../beast_asio/http/HTTPClientType.cpp | 8 +- .../modules/beast_asio/http/HTTPClientType.h | 2 +- src/beast/modules/beast_asio/http/HTTPField.h | 2 +- .../modules/beast_asio/http/HTTPHeaders.h | 4 +- .../modules/beast_asio/http/HTTPMessage.h | 10 +- .../modules/beast_asio/http/HTTPParser.h | 4 +- .../modules/beast_asio/http/HTTPRequest.h | 2 +- .../beast_asio/http/HTTPRequestParser.h | 2 +- .../beast_asio/http/HTTPResponseParser.h | 2 +- .../protocol/HandshakeDetectLogicPROXY.h | 4 +- .../beast_asio/protocol/HandshakeDetector.h | 10 +- .../modules/beast_asio/protocol/InputParser.h | 2 +- .../beast_asio/protocol/PrefilledReadStream.h | 2 +- .../modules/beast_asio/system/BoostIncludes.h | 2 +- src/beast/modules/beast_asio/tests/PeerTest.h | 2 +- .../beast_asio/tests/TestPeerDetails.h | 2 +- .../beast_asio/tests/TestPeerDetailsTcp.h | 2 +- .../beast_asio/tests/TestPeerUnitTests.cpp | 2 +- src/beast/modules/beast_core/beast_core.h | 134 ++-- .../modules/beast_core/beast_core.unity.cpp | 94 +-- .../modules/beast_core/containers/Array.h | 6 +- .../containers/ArrayAllocationBase.h | 2 +- .../beast_core/diagnostic/FatalError.cpp | 2 +- .../beast_core/diagnostic/SemanticVersion.cpp | 2 +- src/beast/modules/beast_core/files/File.cpp | 2 +- src/beast/modules/beast_core/files/File.h | 12 +- .../beast_core/files/RandomAccessFile.cpp | 2 +- src/beast/modules/beast_core/maths/Random.cpp | 2 +- .../modules/beast_core/memory/MemoryBlock.h | 2 +- .../beast_core/memory/SharedSingleton.h | 6 +- .../beast_core/native/BasicNativeHeaders.h | 2 +- .../modules/beast_core/system/BeforeBoost.h | 4 +- .../beast_core/system/FunctionalIncludes.h | 6 +- .../modules/beast_core/text/LexicalCast.cpp | 2 +- .../modules/beast_core/text/LexicalCast.h | 2 +- .../modules/beast_core/text/StringArray.h | 4 +- .../modules/beast_core/text/StringPairArray.h | 4 +- .../modules/beast_core/thread/Workers.cpp | 2 +- src/beast/modules/beast_core/thread/Workers.h | 4 +- .../beast_core/thread/detail/ScopedLock.h | 2 +- .../beast_core/threads/CriticalSection.h | 2 +- .../modules/beast_core/time/AtExitHook.h | 2 +- src/beast/modules/beast_core/time/Time.h | 2 +- src/beast/modules/beast_sqdb/api/session.h | 4 +- .../modules/beast_sqdb/api/transaction.h | 2 +- .../beast_sqdb/api/type_conversion_traits.h | 2 +- src/beast/modules/beast_sqdb/beast_sqdb.h | 34 +- .../modules/beast_sqdb/beast_sqdb.unity.cpp | 34 +- src/beast/modules/beast_sqlite/beast_sqlite.h | 6 +- .../modules/beast_sqlite/beast_sqlite.unity.c | 6 +- .../modules/beast_sqlite/sqlite/sqlite3.c | 34 +- src/beast/site_scons/site_tools/VSProject.py | 25 +- src/ripple/beast/ripple_beast.unity.cpp | 36 +- src/ripple/beast/ripple_beastc.unity.c | 4 +- src/ripple/common/KeyCache.h | 10 +- src/ripple/common/MultiSocket.h | 6 +- src/ripple/common/Resolver.h | 4 +- src/ripple/common/ResolverAsio.h | 4 +- src/ripple/common/RippleSSLContext.h | 2 +- src/ripple/common/TaggedCache.h | 8 +- src/ripple/common/UnorderedContainers.h | 2 +- src/ripple/common/byte_view.h | 2 +- src/ripple/common/impl/KeyCache.cpp | 6 +- src/ripple/common/impl/MultiSocket.cpp | 6 +- src/ripple/common/impl/MultiSocketType.h | 10 +- src/ripple/common/impl/ResolverAsio.cpp | 6 +- src/ripple/common/impl/RippleSSLContext.cpp | 2 +- src/ripple/common/impl/TaggedCache.cpp | 6 +- src/ripple/common/jsonrpc_fields.h | 2 +- src/ripple/common/ripple_common.unity.cpp | 12 +- src/ripple/common/seconds_clock.h | 4 +- src/ripple/common/tests/cross_offer.test.cpp | 6 +- src/ripple/http/api/Port.h | 4 +- src/ripple/http/api/Session.h | 8 +- src/ripple/http/impl/Peer.h | 10 +- src/ripple/http/impl/ServerImpl.h | 4 +- src/ripple/http/ripple_http.h | 12 +- src/ripple/http/ripple_http.unity.cpp | 24 +- src/ripple/json/api/JsonPropertyStream.h | 2 +- src/ripple/json/impl/Tests.cpp | 4 +- src/ripple/json/impl/json_value.cpp | 8 +- src/ripple/json/ripple_json.h | 26 +- src/ripple/json/ripple_json.unity.cpp | 18 +- src/ripple/peerfinder/api/Callback.h | 2 +- src/ripple/peerfinder/api/Manager.h | 10 +- src/ripple/peerfinder/api/Slot.h | 4 +- src/ripple/peerfinder/api/Types.h | 4 +- src/ripple/peerfinder/impl/Bootcache.cpp | 2 +- src/ripple/peerfinder/impl/Checker.cpp | 4 +- src/ripple/peerfinder/impl/Checker.h | 2 +- .../peerfinder/impl/ConnectHandouts.cpp | 2 +- src/ripple/peerfinder/impl/ConnectHandouts.h | 4 +- src/ripple/peerfinder/impl/Counts.h | 2 +- src/ripple/peerfinder/impl/Endpoint.cpp | 2 +- src/ripple/peerfinder/impl/Fixed.h | 2 +- src/ripple/peerfinder/impl/Livecache.cpp | 4 +- src/ripple/peerfinder/impl/Livecache.h | 4 +- src/ripple/peerfinder/impl/Logic.h | 14 +- .../peerfinder/impl/RedirectHandouts.cpp | 2 +- src/ripple/peerfinder/impl/RedirectHandouts.h | 4 +- src/ripple/peerfinder/impl/SlotHandouts.cpp | 2 +- src/ripple/peerfinder/impl/SlotHandouts.h | 4 +- src/ripple/peerfinder/impl/SlotImp.cpp | 2 +- src/ripple/peerfinder/impl/SlotImp.h | 6 +- src/ripple/peerfinder/ripple_peerfinder.h | 16 +- .../peerfinder/ripple_peerfinder.unity.cpp | 86 +-- src/ripple/radmap/api/BasicFullBelowCache.h | 6 +- src/ripple/radmap/ripple_radmap.h | 4 +- src/ripple/radmap/ripple_radmap.unity.cpp | 4 +- src/ripple/resource/api/Consumer.h | 2 +- src/ripple/resource/api/Gossip.h | 2 +- src/ripple/resource/api/Manager.h | 10 +- src/ripple/resource/impl/Logic.h | 4 +- src/ripple/resource/impl/Manager.cpp | 2 +- src/ripple/resource/impl/Tests.cpp | 6 +- src/ripple/resource/ripple_resource.h | 18 +- src/ripple/resource/ripple_resource.unity.cpp | 40 +- src/ripple/rocksdb/ripple_rocksdb.h | 48 +- src/ripple/rocksdb/ripple_rocksdb.unity.cpp | 122 +-- src/ripple/sitefiles/api/Listener.h | 2 +- src/ripple/sitefiles/api/Manager.h | 4 +- src/ripple/sitefiles/api/Section.h | 2 +- src/ripple/sitefiles/api/SiteFile.h | 4 +- src/ripple/sitefiles/impl/Logic.h | 2 +- src/ripple/sitefiles/ripple_sitefiles.h | 14 +- .../sitefiles/ripple_sitefiles.unity.cpp | 18 +- src/ripple/sslutil/api/CAutoBN_CTX.h | 2 +- src/ripple/sslutil/impl/ECDSACanonical.cpp | 2 +- src/ripple/sslutil/ripple_sslutil.h | 14 +- src/ripple/sslutil/ripple_sslutil.unity.cpp | 12 +- src/ripple/testoverlay/impl/TestOverlay.cpp | 4 +- src/ripple/testoverlay/ripple_testoverlay.h | 24 +- .../testoverlay/ripple_testoverlay.unity.cpp | 6 +- src/ripple/types/api/Base58.h | 2 +- src/ripple/types/api/CryptoIdentifier.h | 8 +- src/ripple/types/api/IdentifierStorage.h | 4 +- src/ripple/types/api/RandomNumbers.h | 2 +- src/ripple/types/api/RippleAccountID.h | 4 +- .../types/api/RippleAccountPrivateKey.h | 2 +- src/ripple/types/api/RippleAccountPublicKey.h | 2 +- src/ripple/types/api/RipplePrivateKey.h | 2 +- src/ripple/types/api/RipplePublicKey.h | 4 +- src/ripple/types/api/RipplePublicKeyHash.h | 2 +- src/ripple/types/api/UInt160.h | 4 +- src/ripple/types/api/base_uint.h | 8 +- src/ripple/types/impl/RandomNumbers.cpp | 8 +- src/ripple/types/impl/RippleAssets.cpp | 4 +- src/ripple/types/ripple_types.h | 52 +- src/ripple/types/ripple_types.unity.cpp | 26 +- src/ripple/validators/api/Manager.h | 4 +- src/ripple/validators/api/Source.h | 4 +- src/ripple/validators/impl/ChosenList.h | 2 +- src/ripple/validators/impl/Tests.cpp | 2 +- src/ripple/validators/impl/Tuning.h | 2 +- src/ripple/validators/ripple_validators.h | 10 +- .../validators/ripple_validators.unity.cpp | 58 +- src/ripple_app/book/Amount.h | 6 +- src/ripple_app/book/Amounts.h | 4 +- src/ripple_app/book/BookTip.h | 6 +- src/ripple_app/book/Offer.h | 12 +- src/ripple_app/book/OfferStream.h | 10 +- src/ripple_app/book/Quality.h | 4 +- src/ripple_app/book/Taker.h | 12 +- src/ripple_app/book/Types.h | 6 +- src/ripple_app/book/impl/BookTip.cpp | 2 +- src/ripple_app/book/impl/OfferStream.cpp | 2 +- src/ripple_app/book/impl/Quality.cpp | 2 +- src/ripple_app/book/impl/Taker.cpp | 2 +- .../book/tests/OfferStream.test.cpp | 4 +- src/ripple_app/book/tests/Quality.test.cpp | 6 +- src/ripple_app/consensus/LedgerConsensus.cpp | 2 +- src/ripple_app/data/SqliteDatabase.h | 2 +- src/ripple_app/ledger/InboundLedger.cpp | 2 +- src/ripple_app/ledger/Ledger.cpp | 4 +- src/ripple_app/main/Application.cpp | 16 +- src/ripple_app/main/Application.h | 2 +- src/ripple_app/main/CollectorManager.h | 2 +- src/ripple_app/main/FatalErrorReporter.cpp | 2 +- src/ripple_app/main/FatalErrorReporter.h | 2 +- src/ripple_app/main/FullBelowCache.h | 4 +- src/ripple_app/main/IoServicePool.cpp | 2 +- src/ripple_app/main/Main.cpp | 6 +- src/ripple_app/main/ParameterTable.cpp | 2 +- src/ripple_app/main/RPCHTTPServer.cpp | 2 +- src/ripple_app/misc/AmendmentTable.h | 2 +- src/ripple_app/misc/NetworkOPs.cpp | 8 +- src/ripple_app/misc/ProofOfWork.h | 2 +- src/ripple_app/misc/ProofOfWorkFactory.cpp | 2 +- src/ripple_app/misc/ProofOfWorkFactory.h | 4 +- src/ripple_app/misc/SerializedTransaction.cpp | 2 +- src/ripple_app/paths/CalcNode.cpp | 8 +- src/ripple_app/paths/CalcNodeAccountFwd.cpp | 6 +- src/ripple_app/paths/CalcNodeAccountRev.cpp | 6 +- src/ripple_app/paths/CalcNodeAdvance.cpp | 6 +- src/ripple_app/paths/CalcNodeDeliverFwd.cpp | 6 +- src/ripple_app/paths/CalcNodeDeliverRev.cpp | 6 +- src/ripple_app/paths/CalcNodeOffer.cpp | 6 +- src/ripple_app/paths/CalcNodeRipple.cpp | 6 +- src/ripple_app/paths/PathNext.cpp | 8 +- src/ripple_app/paths/PathRequest.cpp | 2 +- src/ripple_app/paths/Pathfinder.cpp | 2 +- src/ripple_app/paths/RippleCalc.cpp | 20 +- src/ripple_app/peers/PeerSet.cpp | 2 +- src/ripple_app/peers/PeerSet.h | 2 +- src/ripple_app/peers/UniqueNodeList.cpp | 2 +- src/ripple_app/ripple_app.h | 156 ++-- src/ripple_app/ripple_app.unity.cpp | 86 +-- src/ripple_app/ripple_app_pt1.unity.cpp | 30 +- src/ripple_app/ripple_app_pt2.unity.cpp | 38 +- src/ripple_app/ripple_app_pt3.unity.cpp | 22 +- src/ripple_app/ripple_app_pt4.unity.cpp | 28 +- src/ripple_app/ripple_app_pt5.unity.cpp | 28 +- src/ripple_app/ripple_app_pt6.unity.cpp | 22 +- src/ripple_app/ripple_app_pt7.unity.cpp | 22 +- src/ripple_app/ripple_app_pt8.unity.cpp | 18 +- src/ripple_app/ripple_app_pt9.unity.cpp | 34 +- src/ripple_app/rpc/RPCHandler.cpp | 2 +- src/ripple_app/rpc/RPCHandler.h | 14 +- src/ripple_app/shamap/FetchPackTests.cpp | 2 +- src/ripple_app/shamap/RadixMapTest.h | 2 +- src/ripple_app/shamap/SHAMap.cpp | 2 +- src/ripple_app/shamap/SHAMap.h | 4 +- src/ripple_app/shamap/SHAMapAddNode.h | 2 +- src/ripple_app/shamap/SHAMapSync.cpp | 2 +- src/ripple_app/transactors/CreateOffer.cpp | 12 +- src/ripple_app/transactors/CreateOffer.h | 6 +- .../transactors/CreateOfferBridged.cpp | 8 +- .../transactors/CreateOfferBridged.h | 2 +- .../transactors/CreateOfferDirect.cpp | 6 +- .../transactors/CreateOfferDirect.h | 2 +- src/ripple_app/transactors/Transactor.cpp | 18 +- src/ripple_app/tx/TransactionAcquire.cpp | 2 +- src/ripple_app/websocket/WSDoor.cpp | 2 +- src/ripple_basics/containers/RangeSet.cpp | 4 +- .../containers/SyncUnorderedMap.h | 2 +- src/ripple_basics/log/LogFile.cpp | 2 +- src/ripple_basics/log/LogSink.cpp | 2 +- src/ripple_basics/log/LogSink.h | 4 +- src/ripple_basics/log/LoggedTimings.h | 8 +- src/ripple_basics/ripple_basics.h | 46 +- src/ripple_basics/ripple_basics.unity.cpp | 30 +- src/ripple_basics/system/BoostIncludes.h | 2 +- .../system/CheckLibraryVersions.cpp | 6 +- src/ripple_basics/utility/CountedObject.h | 2 +- src/ripple_basics/utility/IniFile.h | 2 +- src/ripple_basics/utility/PlatformMacros.h | 2 +- src/ripple_basics/utility/StringUtilities.cpp | 2 +- src/ripple_core/functional/Config.cpp | 2 +- src/ripple_core/functional/Config.h | 2 +- src/ripple_core/functional/JobQueue.cpp | 16 +- src/ripple_core/functional/JobQueue.h | 2 +- src/ripple_core/functional/JobTypeData.h | 2 +- src/ripple_core/functional/JobTypes.h | 4 +- src/ripple_core/functional/LoadEvent.h | 2 +- .../functional/LoadFeeTrackImp.cpp | 2 +- src/ripple_core/functional/LoadFeeTrackImp.h | 2 +- src/ripple_core/nodestore/NodeStore.cpp | 76 +- src/ripple_core/nodestore/NodeStore.h | 20 +- .../nodestore/backend/RocksDBFactory.cpp | 722 +++++++++--------- src/ripple_core/nodestore/impl/DatabaseImp.h | 2 +- .../nodestore/tests/BackendTests.cpp | 2 +- src/ripple_core/nodestore/tests/TestBase.h | 4 +- src/ripple_core/ripple_core.h | 26 +- src/ripple_core/ripple_core.unity.cpp | 24 +- src/ripple_data/crypto/Base58Data.h | 4 +- src/ripple_data/crypto/CKey.cpp | 2 +- src/ripple_data/protocol/BuildInfo.cpp | 6 +- src/ripple_data/protocol/FieldNames.cpp | 4 +- src/ripple_data/protocol/FieldNames.h | 4 +- src/ripple_data/protocol/KnownFormats.h | 2 +- src/ripple_data/protocol/RippleAddress.cpp | 2 +- src/ripple_data/protocol/RippleAddress.h | 18 +- src/ripple_data/protocol/STAmount.cpp | 2 +- src/ripple_data/protocol/STParsedJSON.cpp | 2 +- src/ripple_data/protocol/Serializer.cpp | 2 +- src/ripple_data/protocol/Serializer.h | 2 +- src/ripple_data/ripple_data.h | 44 +- src/ripple_data/ripple_data.unity.cpp | 52 +- src/ripple_hyperleveldb/ripple_hyperleveldb.h | 10 +- .../ripple_hyperleveldb.unity.cpp | 82 +- src/ripple_leveldb/ripple_leveldb.unity.cpp | 82 +- src/ripple_net/basics/HTTPRequest.cpp | 2 +- src/ripple_net/basics/RPCDoor.cpp | 2 +- src/ripple_net/basics/SNTPClient.cpp | 2 +- src/ripple_net/basics/impl/RPCServerImp.h | 2 +- src/ripple_net/ripple_net.h | 32 +- src/ripple_net/ripple_net.unity.cpp | 30 +- src/ripple_overlay/api/Message.h | 2 +- src/ripple_overlay/api/Overlay.h | 10 +- src/ripple_overlay/api/Peer.h | 10 +- src/ripple_overlay/api/make_Overlay.h | 12 +- src/ripple_overlay/api/predicates.h | 4 +- src/ripple_overlay/impl/Message.cpp | 2 +- src/ripple_overlay/impl/OverlayImpl.cpp | 8 +- src/ripple_overlay/impl/OverlayImpl.h | 14 +- src/ripple_overlay/impl/PeerDoor.cpp | 4 +- src/ripple_overlay/impl/PeerDoor.h | 4 +- src/ripple_overlay/impl/PeerImp.h | 18 +- src/ripple_overlay/ripple_overlay.unity.cpp | 8 +- src/ripple_rpc/api/ErrorCodes.h | 2 +- src/ripple_rpc/api/Manager.h | 2 +- src/ripple_rpc/api/Request.h | 4 +- src/ripple_rpc/handlers/Connect.cpp | 2 +- src/ripple_rpc/handlers/Peers.cpp | 2 +- src/ripple_rpc/handlers/RipplePathFind.cpp | 2 +- src/ripple_rpc/impl/AccountFromString.cpp | 2 +- src/ripple_rpc/impl/Accounts.cpp | 2 +- src/ripple_rpc/impl/Authorize.cpp | 2 +- src/ripple_rpc/impl/ErrorCodes.cpp | 2 +- src/ripple_rpc/impl/GetMasterGenerator.cpp | 2 +- src/ripple_rpc/impl/Handlers.cpp | 136 ++-- src/ripple_rpc/impl/LegacyPathFind.cpp | 4 +- src/ripple_rpc/impl/LookupLedger.cpp | 2 +- src/ripple_rpc/impl/Manager.cpp | 6 +- src/ripple_rpc/impl/ParseAccountIds.cpp | 2 +- src/ripple_rpc/impl/TransactionSign.cpp | 2 +- src/ripple_rpc/ripple_rpc.h | 8 +- src/ripple_rpc/ripple_rpc.unity.cpp | 8 +- src/ripple_websocket/autosocket/AutoSocket.h | 2 +- src/ripple_websocket/ripple_websocket.h | 16 +- .../ripple_websocket.unity.cpp | 24 +- src/snappy/snappy.unity.cpp | 8 +- src/websocket/src/sockets/multitls.hpp | 2 +- 535 files changed, 2720 insertions(+), 2793 deletions(-) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index c827853341..0329336019 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -51,7 +51,7 @@ _WIN32_WINNT=0x6000;DEBUG;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) Async True True @@ -88,7 +88,7 @@ _WIN32_WINNT=0x6000;NDEBUG;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) Async True Cdecl @@ -128,8 +128,6 @@ - - @@ -1801,12 +1799,8 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -1844,8 +1838,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -1885,8 +1877,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -1928,8 +1918,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2019,8 +2007,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2040,8 +2026,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) Document @@ -2056,8 +2040,6 @@ false - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2069,8 +2051,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2121,14 +2101,10 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -2481,8 +2457,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2511,8 +2485,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2540,8 +2512,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2612,8 +2582,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -2674,8 +2642,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3060,44 +3026,24 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -3309,8 +3255,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3508,8 +3452,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -3611,22 +3553,16 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -3655,8 +3591,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -3709,8 +3643,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3951,8 +3883,6 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) True @@ -3965,14 +3895,10 @@ - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\build\proto;..\..\src;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 8d04b75b8b..e870d20e2b 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -648,9 +648,6 @@ src - - src\beast - src\beast\beast diff --git a/SConstruct b/SConstruct index dc7bbe2c47..70560f7548 100644 --- a/SConstruct +++ b/SConstruct @@ -424,9 +424,10 @@ import_environ(base) config_base(base) base.Append(CPPPATH=[ 'src', - os.path.join(build_dir, 'proto'), + os.path.join('src', 'beast'), os.path.join('src', 'snappy', 'snappy'), os.path.join('src', 'snappy', 'config'), + os.path.join(build_dir, 'proto'), ]) base.Append(CPPPATH=[ os.path.join('src', 'leveldb'), diff --git a/src/beast/Builds/VisualStudio2013/Beast.props b/src/beast/Builds/VisualStudio2013/Beast.props index f1c7c45345..1a08f4920c 100644 --- a/src/beast/Builds/VisualStudio2013/Beast.props +++ b/src/beast/Builds/VisualStudio2013/Beast.props @@ -2,16 +2,16 @@ - ..\.. + $(ProjectDir)\..\..\ Level4 - BEAST_INCLUDE_BEASTCONFIG=1;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + BEAST_INCLUDE_BEASTCONFIG=0;_CRTDBG_MAP_ALLOC;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true false - %(AdditionalIncludeDirectories) + $(RepoDir);%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) diff --git a/src/beast/beast/Arithmetic.h b/src/beast/beast/Arithmetic.h index bcbadc43dd..a23b926503 100644 --- a/src/beast/beast/Arithmetic.h +++ b/src/beast/beast/Arithmetic.h @@ -24,9 +24,9 @@ #ifndef BEAST_ARITHMETIC_H_INCLUDED #define BEAST_ARITHMETIC_H_INCLUDED -#include "Config.h" +#include -#include "utility/noexcept.h" +#include #include #include diff --git a/src/beast/beast/Atomic.h b/src/beast/beast/Atomic.h index ffeb82a695..fcae075f4a 100644 --- a/src/beast/beast/Atomic.h +++ b/src/beast/beast/Atomic.h @@ -24,10 +24,10 @@ #ifndef BEAST_ATOMIC_H_INCLUDED #define BEAST_ATOMIC_H_INCLUDED -#include "Config.h" -#include "StaticAssert.h" +#include +#include -#include "utility/noexcept.h" +#include #include diff --git a/src/beast/beast/Boost.h b/src/beast/beast/Boost.h index 708b63ab34..4746c0a874 100644 --- a/src/beast/beast/Boost.h +++ b/src/beast/beast/Boost.h @@ -22,6 +22,6 @@ // These classes require boost in order to be used. -#include "boost/ErrorCode.h" +#include #endif diff --git a/src/beast/beast/ByteOrder.h b/src/beast/beast/ByteOrder.h index e17736d348..2bd069388d 100644 --- a/src/beast/beast/ByteOrder.h +++ b/src/beast/beast/ByteOrder.h @@ -24,8 +24,8 @@ #ifndef BEAST_BYTEORDER_H_INCLUDED #define BEAST_BYTEORDER_H_INCLUDED -#include "Config.h" -#include "Uncopyable.h" +#include +#include #include diff --git a/src/beast/beast/Chrono.h b/src/beast/beast/Chrono.h index 3e8b4220db..6aea7d82a6 100644 --- a/src/beast/beast/Chrono.h +++ b/src/beast/beast/Chrono.h @@ -20,13 +20,13 @@ #ifndef BEAST_CHRONO_H_INCLUDED #define BEAST_CHRONO_H_INCLUDED -#include "chrono/abstract_clock.h" -#include "chrono/basic_seconds_clock.h" -#include "chrono/chrono_io.h" -#include "chrono/chrono_util.h" -#include "chrono/manual_clock.h" -#include "chrono/ratio_io.h" +#include +#include +#include +#include +#include +#include -#include "chrono/RelativeTime.h" +#include #endif diff --git a/src/beast/beast/Config.h b/src/beast/beast/Config.h index b145d9fa3d..0170f92ecb 100644 --- a/src/beast/beast/Config.h +++ b/src/beast/beast/Config.h @@ -30,34 +30,34 @@ #define BOOST_ASIO_HAS_STD_ARRAY 1 #if !defined(BEAST_COMPILER_CONFIG) && !defined(BEAST_NO_COMPILER_CONFIG) && !defined(BEAST_NO_CONFIG) -#include "config/SelectCompilerConfig.h" +#include #endif #ifdef BEAST_COMPILER_CONFIG #include BEAST_COMPILER_CONFIG #endif #if !defined(BEAST_STDLIB_CONFIG) && !defined(BEAST_NO_STDLIB_CONFIG) && !defined(BEAST_NO_CONFIG) && defined(__cplusplus) -#include "config/SelectStdlibConfig.h" +#include #endif #ifdef BEAST_STDLIB_CONFIG #include BEAST_STDLIB_CONFIG #endif #if !defined(BEAST_PLATFORM_CONFIG) && !defined(BEAST_NO_PLATFORM_CONFIG) && !defined(BEAST_NO_CONFIG) -#include "config/SelectCompilerConfig.h" +#include #endif #ifdef BEAST_PLATFORM_CONFIG #include BEAST_PLATFORM_CONFIG #endif // Legacy -#include "Version.h" -#include "config/PlatformConfig.h" -#include "config/CompilerConfig.h" -#include "config/StandardConfig.h" -#include "config/ConfigCheck.h" +#include +#include +#include +#include +#include // Suffix -#include "config/Suffix.h" +#include #endif diff --git a/src/beast/beast/Crypto.h b/src/beast/beast/Crypto.h index c84425be51..27e79e04c0 100644 --- a/src/beast/beast/Crypto.h +++ b/src/beast/beast/Crypto.h @@ -20,11 +20,11 @@ #ifndef BEAST_CRYPTO_H_INCLUDED #define BEAST_CRYPTO_H_INCLUDED -#include "crypto/BinaryEncoding.h" -#include "crypto/MurmurHash.h" -#include "crypto/Sha256.h" -#include "crypto/UnsignedInteger.h" -#include "crypto/UnsignedIntegerCalc.h" +#include +#include +#include +#include +#include #endif diff --git a/src/beast/beast/HeapBlock.h b/src/beast/beast/HeapBlock.h index 9fdea3e985..cbbe097cf6 100644 --- a/src/beast/beast/HeapBlock.h +++ b/src/beast/beast/HeapBlock.h @@ -28,8 +28,8 @@ #include #include -#include "Memory.h" -#include "Uncopyable.h" +#include +#include // If the MSVC debug heap headers were included, disable // the macros during the juce include since they conflict. diff --git a/src/beast/beast/Insight.h b/src/beast/beast/Insight.h index 2ec5b42ed1..25c456827f 100644 --- a/src/beast/beast/Insight.h +++ b/src/beast/beast/Insight.h @@ -20,18 +20,18 @@ #ifndef BEAST_INSIGHT_H_INCLUDED #define BEAST_INSIGHT_H_INCLUDED -#include "insight/Counter.h" -#include "insight/CounterImpl.h" -#include "insight/Event.h" -#include "insight/EventImpl.h" -#include "insight/Gauge.h" -#include "insight/GaugeImpl.h" -#include "insight/Group.h" -#include "insight/Groups.h" -#include "insight/Hook.h" -#include "insight/HookImpl.h" -#include "insight/Collector.h" -#include "insight/NullCollector.h" -#include "insight/StatsDCollector.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/beast/beast/Intrusive.h b/src/beast/beast/Intrusive.h index 89a3ace3bd..2932453c5c 100644 --- a/src/beast/beast/Intrusive.h +++ b/src/beast/beast/Intrusive.h @@ -20,7 +20,7 @@ #ifndef BEAST_INTRUSIVE_H_INCLUDED #define BEAST_INTRUSIVE_H_INCLUDED -#include "intrusive/List.h" -#include "intrusive/LockFreeStack.h" +#include +#include #endif diff --git a/src/beast/beast/Memory.h b/src/beast/beast/Memory.h index adb3717f2e..e84e0e6827 100644 --- a/src/beast/beast/Memory.h +++ b/src/beast/beast/Memory.h @@ -26,8 +26,8 @@ #include -#include "Config.h" -#include "Uncopyable.h" +#include +#include namespace beast { diff --git a/src/beast/beast/SmartPtr.h b/src/beast/beast/SmartPtr.h index 13aab726a8..c1f91ff0ce 100644 --- a/src/beast/beast/SmartPtr.h +++ b/src/beast/beast/SmartPtr.h @@ -20,11 +20,11 @@ #ifndef BEAST_SMARTPTR_H_INCLUDED #define BEAST_SMARTPTR_H_INCLUDED -#include "Config.h" +#include -#include "smart_ptr/ContainerDeletePolicy.h" -#include "smart_ptr/SharedObject.h" -#include "smart_ptr/SharedPtr.h" -#include "smart_ptr/ScopedPointer.h" +#include +#include +#include +#include #endif diff --git a/src/beast/beast/Strings.h b/src/beast/beast/Strings.h index 5b76162400..b7fa033110 100644 --- a/src/beast/beast/Strings.h +++ b/src/beast/beast/Strings.h @@ -20,8 +20,8 @@ #ifndef BEAST_STRINGS_H_INCLUDED #define BEAST_STRINGS_H_INCLUDED -#include "strings/String.h" -#include "strings/NewLine.h" +#include +#include #endif diff --git a/src/beast/beast/Threads.h b/src/beast/beast/Threads.h index 756376a2fd..9f349151ae 100644 --- a/src/beast/beast/Threads.h +++ b/src/beast/beast/Threads.h @@ -20,19 +20,19 @@ #ifndef BEAST_THREADS_H_INCLUDED #define BEAST_THREADS_H_INCLUDED -#include "threads/UnlockGuard.h" -#include "threads/TryLockGuard.h" -#include "threads/SharedLockGuard.h" -#include "threads/SharedMutexAdapter.h" -#include "threads/SharedData.h" -#include "threads/ServiceQueue.h" -#include "threads/SpinLock.h" -#include "threads/Stoppable.h" -#include "threads/Thread.h" -#include "threads/ThreadLocalValue.h" -#include "threads/WaitableEvent.h" -#include "threads/ScopedWrapperContext.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "threads/semaphore.h" +#include #endif diff --git a/src/beast/beast/asio/Asio.unity.cpp b/src/beast/beast/asio/Asio.unity.cpp index 4f964be9ba..dbe4b458df 100644 --- a/src/beast/beast/asio/Asio.unity.cpp +++ b/src/beast/beast/asio/Asio.unity.cpp @@ -18,15 +18,15 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/IPAddressConversion.cpp" +#include -#include "tests/wrap_handler.test.cpp" -#include "tests/bind_handler.test.cpp" -#include "tests/enable_wait_for_async.test.cpp" -#include "tests/shared_handler.test.cpp" +#include +#include +#include +#include -#include "abstract_socket.cpp" // TEMPORARY! +#include // TEMPORARY! diff --git a/src/beast/beast/asio/IPAddressConversion.h b/src/beast/beast/asio/IPAddressConversion.h index 182691c043..13572340bb 100644 --- a/src/beast/beast/asio/IPAddressConversion.h +++ b/src/beast/beast/asio/IPAddressConversion.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED #define BEAST_ASIO_IPADDRESSCONVERSION_H_INCLUDED -#include "../net/IPEndpoint.h" +#include #include diff --git a/src/beast/beast/asio/abstract_socket.cpp b/src/beast/beast/asio/abstract_socket.cpp index ba2e950e30..dfd542db5a 100644 --- a/src/beast/beast/asio/abstract_socket.cpp +++ b/src/beast/beast/asio/abstract_socket.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "abstract_socket.h" -#include "bind_handler.h" +#include +#include namespace beast { namespace asio { diff --git a/src/beast/beast/asio/abstract_socket.h b/src/beast/beast/asio/abstract_socket.h index 9900e184d2..ec3c5cbcdd 100644 --- a/src/beast/beast/asio/abstract_socket.h +++ b/src/beast/beast/asio/abstract_socket.h @@ -20,8 +20,8 @@ #ifndef BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED #define BEAST_ASIO_ABSTRACT_SOCKET_H_INCLUDED -#include "buffer_sequence.h" -#include "shared_handler.h" +#include +#include #include #include diff --git a/src/beast/beast/asio/bind_handler.h b/src/beast/beast/asio/bind_handler.h index d2ce51f1e2..778b37230e 100644 --- a/src/beast/beast/asio/bind_handler.h +++ b/src/beast/beast/asio/bind_handler.h @@ -25,8 +25,8 @@ #include #include -#include "../cxx14/type_traits.h" // -#include "../cxx14/utility.h" // +#include // +#include // namespace beast { namespace asio { diff --git a/src/beast/beast/asio/buffer_sequence.h b/src/beast/beast/asio/buffer_sequence.h index 19489fbf6b..d2259eba62 100644 --- a/src/beast/beast/asio/buffer_sequence.h +++ b/src/beast/beast/asio/buffer_sequence.h @@ -22,10 +22,10 @@ #include -#include "../utility/noexcept.h" +#include #include #include -#include "../cxx14/type_traits.h" // +#include // #include namespace beast { diff --git a/src/beast/beast/asio/enable_wait_for_async.h b/src/beast/beast/asio/enable_wait_for_async.h index bdd3f83a3d..2ba0a796da 100644 --- a/src/beast/beast/asio/enable_wait_for_async.h +++ b/src/beast/beast/asio/enable_wait_for_async.h @@ -20,9 +20,9 @@ #ifndef BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED #define BEAST_ASIO_ENABLE_WAIT_FOR_ASYNC_H_INCLUDED -#include "wrap_handler.h" +#include -#include "../utility/is_call_possible.h" +#include #include #include @@ -31,7 +31,7 @@ #include #include #include -#include "../cxx14/type_traits.h" // +#include // namespace beast { namespace asio { diff --git a/src/beast/beast/asio/impl/IPAddressConversion.cpp b/src/beast/beast/asio/impl/IPAddressConversion.cpp index d97f3811f4..70f61c69ac 100644 --- a/src/beast/beast/asio/impl/IPAddressConversion.cpp +++ b/src/beast/beast/asio/impl/IPAddressConversion.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../IPAddressConversion.h" +#include namespace beast { namespace IP { diff --git a/src/beast/beast/asio/memory_buffer.h b/src/beast/beast/asio/memory_buffer.h index 7f43be1bf3..f775687833 100644 --- a/src/beast/beast/asio/memory_buffer.h +++ b/src/beast/beast/asio/memory_buffer.h @@ -20,11 +20,11 @@ #ifndef BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED #define BEAST_ASIO_MEMORY_BUFFER_H_INCLUDED -#include "../utility/empty_base_optimization.h" +#include #include -#include "../utility/noexcept.h" +#include #include #include #include diff --git a/src/beast/beast/asio/shared_handler.h b/src/beast/beast/asio/shared_handler.h index 58e8e2c46f..bc8a149a3b 100644 --- a/src/beast/beast/asio/shared_handler.h +++ b/src/beast/beast/asio/shared_handler.h @@ -20,19 +20,19 @@ #ifndef BEAST_ASIO_SHARED_HANDLER_H_INCLUDED #define BEAST_ASIO_SHARED_HANDLER_H_INCLUDED -#include "../Config.h" +#include -#include "../utility/is_call_possible.h" +#include #include #include #include #include -#include "../utility/noexcept.h" +#include #include #include -#include "../cxx14/type_traits.h" // +#include // #ifndef BEAST_ASIO_NO_ALLOCATE_SHARED #define BEAST_ASIO_NO_ALLOCATE_SHARED 0 diff --git a/src/beast/beast/asio/socket_wrapper.h b/src/beast/beast/asio/socket_wrapper.h index c5df18f538..2b07c0b43e 100644 --- a/src/beast/beast/asio/socket_wrapper.h +++ b/src/beast/beast/asio/socket_wrapper.h @@ -20,10 +20,10 @@ #ifndef BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED #define BEAST_ASIO_SOCKET_WRAPPER_H_INCLUDED -#include "abstract_socket.h" -#include "bind_handler.h" +#include +#include -#include "../utility/noexcept.h" +#include namespace beast { namespace asio { diff --git a/src/beast/beast/asio/tests/bind_handler.test.cpp b/src/beast/beast/asio/tests/bind_handler.test.cpp index 34c1001aff..551d327562 100644 --- a/src/beast/beast/asio/tests/bind_handler.test.cpp +++ b/src/beast/beast/asio/tests/bind_handler.test.cpp @@ -20,12 +20,12 @@ // LIBS: boost_system #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../../unit_test/suite.h" +#include -#include "../bind_handler.h" +#include #include diff --git a/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp b/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp index f09f53e442..fd529fed4f 100644 --- a/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp +++ b/src/beast/beast/asio/tests/enable_wait_for_async.test.cpp @@ -18,13 +18,13 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../../unit_test/suite.h" +#include -#include "../bind_handler.h" -#include "../enable_wait_for_async.h" +#include +#include #include diff --git a/src/beast/beast/asio/tests/shared_handler.test.cpp b/src/beast/beast/asio/tests/shared_handler.test.cpp index 686c0f08a9..d32ef19614 100644 --- a/src/beast/beast/asio/tests/shared_handler.test.cpp +++ b/src/beast/beast/asio/tests/shared_handler.test.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../../unit_test/suite.h" +#include -#include "../shared_handler.h" +#include // Disables is_constructible tests for std::function // Visual Studio std::function fails the is_constructible tests diff --git a/src/beast/beast/asio/tests/wrap_handler.test.cpp b/src/beast/beast/asio/tests/wrap_handler.test.cpp index be72dbb02c..8c3fe0a8b2 100644 --- a/src/beast/beast/asio/tests/wrap_handler.test.cpp +++ b/src/beast/beast/asio/tests/wrap_handler.test.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../../unit_test/suite.h" +#include -#include "../wrap_handler.h" +#include #include diff --git a/src/beast/beast/asio/wrap_handler.h b/src/beast/beast/asio/wrap_handler.h index 02ee7895f9..4bda7f4b9a 100644 --- a/src/beast/beast/asio/wrap_handler.h +++ b/src/beast/beast/asio/wrap_handler.h @@ -24,7 +24,7 @@ #include #include -#include "../cxx14/type_traits.h" // +#include // #include namespace beast { diff --git a/src/beast/beast/boost/Boost.unity.cpp b/src/beast/beast/boost/Boost.unity.cpp index f692682bff..042d7f2e20 100644 --- a/src/beast/beast/boost/Boost.unity.cpp +++ b/src/beast/beast/boost/Boost.unity.cpp @@ -18,10 +18,10 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "ErrorCode.h" +#include namespace detail { diff --git a/src/beast/beast/chrono/Chrono.unity.cpp b/src/beast/beast/chrono/Chrono.unity.cpp index 4306d7e800..0dcc37d3e8 100644 --- a/src/beast/beast/chrono/Chrono.unity.cpp +++ b/src/beast/beast/chrono/Chrono.unity.cpp @@ -18,13 +18,13 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "../Config.h" +#include -#include "impl/chrono_io.cpp" -#include "impl/RelativeTime.cpp" +#include +#include -#include "tests/abstract_clock.test.cpp" -#include "tests/basic_seconds_clock.test.cpp" +#include +#include diff --git a/src/beast/beast/chrono/RelativeTime.h b/src/beast/beast/chrono/RelativeTime.h index b4e849f0bb..f54346db25 100644 --- a/src/beast/beast/chrono/RelativeTime.h +++ b/src/beast/beast/chrono/RelativeTime.h @@ -24,10 +24,10 @@ #ifndef BEAST_CHRONO_RELATIVETIME_H_INCLUDED #define BEAST_CHRONO_RELATIVETIME_H_INCLUDED -#include "../Config.h" -#include "../strings/String.h" +#include +#include -#include "../utility/noexcept.h" +#include #include #include diff --git a/src/beast/beast/chrono/abstract_clock_io.h b/src/beast/beast/chrono/abstract_clock_io.h index bd2ad9931e..45f9dd8154 100644 --- a/src/beast/beast/chrono/abstract_clock_io.h +++ b/src/beast/beast/chrono/abstract_clock_io.h @@ -20,7 +20,7 @@ #ifndef BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED #define BEAST_CHRONO_ABSTRACT_CLOCK_IO_H_INCLUDED -#include "chrono_io.h" +#include namespace beast { diff --git a/src/beast/beast/chrono/basic_seconds_clock.h b/src/beast/beast/chrono/basic_seconds_clock.h index 42db9ab95a..bc8154f44a 100644 --- a/src/beast/beast/chrono/basic_seconds_clock.h +++ b/src/beast/beast/chrono/basic_seconds_clock.h @@ -39,22 +39,22 @@ #endif #if BEAST_BASIC_SECONDS_CLOCK_BOOST_WORKAROUND -# include +#include # if BOOST_VERSION >= 105500 -# include -# include -# include -# include +#include +#include +#include +#include # else # error "Boost version 1.55.0 or later is required" # endif #else -# include -# include -# include +#include +#include +#include #endif -#include "../chrono/chrono_util.h" +#include namespace beast { diff --git a/src/beast/beast/chrono/chrono_io.h b/src/beast/beast/chrono/chrono_io.h index 151297f1ec..a17cd4aea8 100644 --- a/src/beast/beast/chrono/chrono_io.h +++ b/src/beast/beast/chrono/chrono_io.h @@ -27,9 +27,9 @@ #ifndef BEAST_CHRONO_CHRONO_IO_H_INCLUDED #define BEAST_CHRONO_CHRONO_IO_H_INCLUDED -#include "../Config.h" +#include -#include "../utility/noexcept.h" +#include #include #include @@ -156,7 +156,7 @@ template */ #include -#include "ratio_io.h" +#include //_LIBCPP_BEGIN_NAMESPACE_STD namespace std { diff --git a/src/beast/beast/chrono/impl/RelativeTime.cpp b/src/beast/beast/chrono/impl/RelativeTime.cpp index 853940bb3e..caf8131bac 100644 --- a/src/beast/beast/chrono/impl/RelativeTime.cpp +++ b/src/beast/beast/chrono/impl/RelativeTime.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../RelativeTime.h" +#include // VFALCO TODO Migrate the localizable strings interfaces for this file diff --git a/src/beast/beast/chrono/impl/chrono_io.cpp b/src/beast/beast/chrono/impl/chrono_io.cpp index b6004bb6e9..6be9104708 100644 --- a/src/beast/beast/chrono/impl/chrono_io.cpp +++ b/src/beast/beast/chrono/impl/chrono_io.cpp @@ -24,7 +24,7 @@ // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt). -#include "../chrono_io.h" +#include //_LIBCPP_BEGIN_NAMESPACE_STD namespace std { diff --git a/src/beast/beast/chrono/manual_clock.h b/src/beast/beast/chrono/manual_clock.h index 8342c7d4f0..24dd9ddd8f 100644 --- a/src/beast/beast/chrono/manual_clock.h +++ b/src/beast/beast/chrono/manual_clock.h @@ -20,7 +20,7 @@ #ifndef BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED #define BEAST_CHRONO_MANUAL_CLOCK_H_INCLUDED -#include "abstract_clock.h" +#include namespace beast { diff --git a/src/beast/beast/chrono/tests/abstract_clock.test.cpp b/src/beast/beast/chrono/tests/abstract_clock.test.cpp index e84925271b..5bf4493ab9 100644 --- a/src/beast/beast/chrono/tests/abstract_clock.test.cpp +++ b/src/beast/beast/chrono/tests/abstract_clock.test.cpp @@ -19,11 +19,11 @@ // MODULES: ../impl/chrono_io.cpp -#include "../abstract_clock.h" -#include "../abstract_clock_io.h" -#include "../manual_clock.h" +#include +#include +#include -#include "../../unit_test/suite.h" +#include #include #include diff --git a/src/beast/beast/chrono/tests/basic_seconds_clock.test.cpp b/src/beast/beast/chrono/tests/basic_seconds_clock.test.cpp index e8e9c58df8..6678d638ea 100644 --- a/src/beast/beast/chrono/tests/basic_seconds_clock.test.cpp +++ b/src/beast/beast/chrono/tests/basic_seconds_clock.test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../unit_test/suite.h" +#include -#include "../basic_seconds_clock.h" +#include namespace beast { diff --git a/src/beast/beast/config/CompilerConfig.h b/src/beast/beast/config/CompilerConfig.h index 1a279e6fee..7eb0e83dbb 100644 --- a/src/beast/beast/config/CompilerConfig.h +++ b/src/beast/beast/config/CompilerConfig.h @@ -25,7 +25,7 @@ #define BEAST_CONFIG_COMPILERCONFIG_H_INCLUDED #include -#include "PlatformConfig.h" +#include // This file defines miscellaneous macros for debugging, assertions, etc. diff --git a/src/beast/beast/config/StandardConfig.h b/src/beast/beast/config/StandardConfig.h index f620563c4a..c2cb0cc1b2 100644 --- a/src/beast/beast/config/StandardConfig.h +++ b/src/beast/beast/config/StandardConfig.h @@ -35,28 +35,28 @@ #endif #if BEAST_USE_INTRINSICS -# include +#include #endif #if BEAST_MAC || BEAST_IOS -# include +#include #endif #if BEAST_LINUX -# include +#include # if __INTEL_COMPILER # if __ia64__ -# include +#include # else -# include +#include # endif # endif #endif #if BEAST_MSVC && BEAST_DEBUG -# include -# include -# include +#include +#include +#include #endif #if BEAST_MSVC diff --git a/src/beast/beast/config/compiler/VisualC.h b/src/beast/beast/config/compiler/VisualC.h index 8f0b308ebb..b4e1c05b7b 100644 --- a/src/beast/beast/config/compiler/VisualC.h +++ b/src/beast/beast/config/compiler/VisualC.h @@ -19,4 +19,4 @@ // Microsoft Visual C++ compiler configuration -#include "../../utility/noexcept.h" +#include diff --git a/src/beast/beast/container/Container.unity.cpp b/src/beast/beast/container/Container.unity.cpp index d8eac03c3c..994129dff3 100644 --- a/src/beast/beast/container/Container.unity.cpp +++ b/src/beast/beast/container/Container.unity.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/spookyv2.cpp" +#include -#include "tests/aged_associative_container.test.cpp" -#include "tests/buffer_view.test.cpp" -#include "tests/hardened_hash.test.cpp" -#include "tests/hash_append.test.cpp" +#include +#include +#include +#include diff --git a/src/beast/beast/container/aged_container_utility.h b/src/beast/beast/container/aged_container_utility.h index 317f833d12..9ba44c6148 100644 --- a/src/beast/beast/container/aged_container_utility.h +++ b/src/beast/beast/container/aged_container_utility.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED #define BEAST_CONTAINER_AGED_CONTAINER_UTILITY_H_INCLUDED -#include "aged_container.h" +#include #include diff --git a/src/beast/beast/container/aged_map.h b/src/beast/beast/container/aged_map.h index 6475e853a8..f9d0470fdc 100644 --- a/src/beast/beast/container/aged_map.h +++ b/src/beast/beast/container/aged_map.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MAP_H_INCLUDED #define BEAST_CONTAINER_AGED_MAP_H_INCLUDED -#include "detail/aged_ordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_multimap.h b/src/beast/beast/container/aged_multimap.h index 58a060dce8..c66ff227d8 100644 --- a/src/beast/beast/container/aged_multimap.h +++ b/src/beast/beast/container/aged_multimap.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED #define BEAST_CONTAINER_AGED_MULTIMAP_H_INCLUDED -#include "detail/aged_ordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_multiset.h b/src/beast/beast/container/aged_multiset.h index ce420977f7..620270d2ec 100644 --- a/src/beast/beast/container/aged_multiset.h +++ b/src/beast/beast/container/aged_multiset.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED #define BEAST_CONTAINER_AGED_MULTISET_H_INCLUDED -#include "detail/aged_ordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_set.h b/src/beast/beast/container/aged_set.h index db69158bae..a5ef922d5c 100644 --- a/src/beast/beast/container/aged_set.h +++ b/src/beast/beast/container/aged_set.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_SET_H_INCLUDED #define BEAST_CONTAINER_AGED_SET_H_INCLUDED -#include "detail/aged_ordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_unordered_map.h b/src/beast/beast/container/aged_unordered_map.h index 909a1c7f1c..b6031bc976 100644 --- a/src/beast/beast/container/aged_unordered_map.h +++ b/src/beast/beast/container/aged_unordered_map.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MAP_H_INCLUDED -#include "detail/aged_unordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_unordered_multimap.h b/src/beast/beast/container/aged_unordered_multimap.h index b3270d81a2..7512392923 100644 --- a/src/beast/beast/container/aged_unordered_multimap.h +++ b/src/beast/beast/container/aged_unordered_multimap.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MULTIMAP_H_INCLUDED -#include "detail/aged_unordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_unordered_multiset.h b/src/beast/beast/container/aged_unordered_multiset.h index b121ad9bb3..c1f3ef353a 100644 --- a/src/beast/beast/container/aged_unordered_multiset.h +++ b/src/beast/beast/container/aged_unordered_multiset.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_MULTISET_H_INCLUDED -#include "detail/aged_unordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/aged_unordered_set.h b/src/beast/beast/container/aged_unordered_set.h index 8c9090b452..83b37de041 100644 --- a/src/beast/beast/container/aged_unordered_set.h +++ b/src/beast/beast/container/aged_unordered_set.h @@ -20,7 +20,7 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_SET_H_INCLUDED -#include "detail/aged_unordered_container.h" +#include #include #include diff --git a/src/beast/beast/container/buffer_view.h b/src/beast/beast/container/buffer_view.h index 1336b69e3c..f6cc9f63bd 100644 --- a/src/beast/beast/container/buffer_view.h +++ b/src/beast/beast/container/buffer_view.h @@ -20,16 +20,16 @@ #ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED #define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED -#include "../Config.h" +#include #include -#include "../cxx14/algorithm.h" // +#include // #include #include #include #include #include -#include "../cxx14/type_traits.h" // +#include // namespace beast { diff --git a/src/beast/beast/container/detail/aged_ordered_container.h b/src/beast/beast/container/detail/aged_ordered_container.h index dd77b28e7d..c248252cc4 100644 --- a/src/beast/beast/container/detail/aged_ordered_container.h +++ b/src/beast/beast/container/detail/aged_ordered_container.h @@ -20,23 +20,23 @@ #ifndef BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED #define BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED -#include "aged_container_iterator.h" -#include "aged_associative_container.h" +#include +#include -#include "../aged_container.h" +#include -#include "../../chrono/abstract_clock.h" -#include "../../utility/empty_base_optimization.h" +#include +#include #include #include -#include "../../cxx14/algorithm.h" // +#include // #include #include #include #include -#include "../../cxx14/type_traits.h" // +#include // #include namespace beast { diff --git a/src/beast/beast/container/detail/aged_unordered_container.h b/src/beast/beast/container/detail/aged_unordered_container.h index 5a1054fecc..deaf741b8c 100644 --- a/src/beast/beast/container/detail/aged_unordered_container.h +++ b/src/beast/beast/container/detail/aged_unordered_container.h @@ -20,23 +20,23 @@ #ifndef BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED #define BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED -#include "aged_container_iterator.h" -#include "aged_associative_container.h" +#include +#include -#include "../aged_container.h" +#include -#include "../../chrono/abstract_clock.h" -#include "../../utility/empty_base_optimization.h" +#include +#include #include #include -#include "../../cxx14/algorithm.h" // +#include // #include #include #include #include -#include "../../cxx14/type_traits.h" // +#include // #include /* diff --git a/src/beast/beast/container/hardened_hash.h b/src/beast/beast/container/hardened_hash.h index df419aafb4..2c632d06af 100644 --- a/src/beast/beast/container/hardened_hash.h +++ b/src/beast/beast/container/hardened_hash.h @@ -20,17 +20,17 @@ #ifndef BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED #define BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED -#include "hash_append.h" +#include -#include "../utility/noexcept.h" +#include #include #include #include #include -#include "../cxx14/type_traits.h" // +#include // #include #include -#include "../cxx14/utility.h" // +#include // // When set to 1, makes the seed per-process instead // of per default-constructed instance of hardened_hash diff --git a/src/beast/beast/container/hash_append.h b/src/beast/beast/container/hash_append.h index 1843911cfb..6f94c5c3fc 100644 --- a/src/beast/beast/container/hash_append.h +++ b/src/beast/beast/container/hash_append.h @@ -21,23 +21,23 @@ #ifndef BEAST_CONTAINER_HASH_APPEND_H_INCLUDED #define BEAST_CONTAINER_HASH_APPEND_H_INCLUDED -#include "../utility/meta.h" +#include -#include "impl/spookyv2.h" +#include #if BEAST_USE_BOOST_FEATURES #include #endif -#include "../utility/noexcept.h" +#include #include #include #include #include #include #include -#include "../cxx14/type_traits.h" // -#include "../cxx14/utility.h" // +#include // +#include // #include // Set to 1 to disable variadic hash_append for tuple. When set, overloads diff --git a/src/beast/beast/container/impl/spookyv2.cpp b/src/beast/beast/container/impl/spookyv2.cpp index b6d444888c..11e8220ea4 100644 --- a/src/beast/beast/container/impl/spookyv2.cpp +++ b/src/beast/beast/container/impl/spookyv2.cpp @@ -10,7 +10,7 @@ // August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash #include -#include "spookyv2.h" +#include #ifdef _MSC_VER #pragma warning (push) diff --git a/src/beast/beast/container/impl/spookyv2.h b/src/beast/beast/container/impl/spookyv2.h index 9e3b56c02c..15ae43a64c 100644 --- a/src/beast/beast/container/impl/spookyv2.h +++ b/src/beast/beast/container/impl/spookyv2.h @@ -38,7 +38,7 @@ typedef unsigned __int16 uint16; typedef unsigned __int8 uint8; #else -# include +#include # define INLINE inline typedef uint64_t uint64; typedef uint32_t uint32; diff --git a/src/beast/beast/container/tests/aged_associative_container.test.cpp b/src/beast/beast/container/tests/aged_associative_container.test.cpp index 7c410fcf8a..828baeb0cc 100644 --- a/src/beast/beast/container/tests/aged_associative_container.test.cpp +++ b/src/beast/beast/container/tests/aged_associative_container.test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include "../../chrono/manual_clock.h" -#include "../../unit_test/suite.h" +#include +#include -#include "../aged_set.h" -#include "../aged_map.h" -#include "../aged_multiset.h" -#include "../aged_multimap.h" -#include "../aged_unordered_set.h" -#include "../aged_unordered_map.h" -#include "../aged_unordered_multiset.h" -#include "../aged_unordered_multimap.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/beast/beast/container/tests/buffer_view.test.cpp b/src/beast/beast/container/tests/buffer_view.test.cpp index 743430cb4c..d61f276fb2 100644 --- a/src/beast/beast/container/tests/buffer_view.test.cpp +++ b/src/beast/beast/container/tests/buffer_view.test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../unit_test/suite.h" +#include -#include "../buffer_view.h" +#include -#include "../../cxx14/algorithm.h" // +#include // namespace beast { diff --git a/src/beast/beast/container/tests/hardened_hash.test.cpp b/src/beast/beast/container/tests/hardened_hash.test.cpp index a3f2d1a2fb..f60f18beda 100644 --- a/src/beast/beast/container/tests/hardened_hash.test.cpp +++ b/src/beast/beast/container/tests/hardened_hash.test.cpp @@ -20,13 +20,13 @@ // MODULES: ../../crypto/impl/Sha256.cpp ../../container/impl/spookyv2.cpp #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../hardened_hash.h" -#include "../../unit_test/suite.h" +#include +#include -#include "../../crypto/Sha256.h" +#include #include #include diff --git a/src/beast/beast/container/tests/hash_append.test.cpp b/src/beast/beast/container/tests/hash_append.test.cpp index c102fcd117..dacff5aa2f 100644 --- a/src/beast/beast/container/tests/hash_append.test.cpp +++ b/src/beast/beast/container/tests/hash_append.test.cpp @@ -20,17 +20,17 @@ // MODULES: ../impl/spookyv2.cpp #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "hash_metrics.h" +#include -#include "../hash_append.h" -#include "../impl/spookyv2.h" +#include +#include -#include "../../chrono/chrono_io.h" -#include "../../unit_test/suite.h" -#include "../../utility/type_name.h" +#include +#include +#include #include #include diff --git a/src/beast/beast/crypto/Crypto.unity.cpp b/src/beast/beast/crypto/Crypto.unity.cpp index 206776e69d..7c158fcbae 100644 --- a/src/beast/beast/crypto/Crypto.unity.cpp +++ b/src/beast/beast/crypto/Crypto.unity.cpp @@ -18,13 +18,13 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/MurmurHash.cpp" -#include "impl/Sha256.cpp" -#include "impl/UnsignedInteger.cpp" +#include +#include +#include -#include "tests/BinaryEncoding.cpp" +#include -#include "tests/UnsignedInteger.test.cpp" +#include diff --git a/src/beast/beast/crypto/Sha256.h b/src/beast/beast/crypto/Sha256.h index c415ac0675..538a3a0118 100644 --- a/src/beast/beast/crypto/Sha256.h +++ b/src/beast/beast/crypto/Sha256.h @@ -20,7 +20,7 @@ #ifndef BEAST_CRYPTO_SHA256_H_INCLUDED #define BEAST_CRYPTO_SHA256_H_INCLUDED -#include "../Config.h" +#include #include #include diff --git a/src/beast/beast/crypto/UnsignedInteger.h b/src/beast/beast/crypto/UnsignedInteger.h index e20badaba0..99346be6b0 100644 --- a/src/beast/beast/crypto/UnsignedInteger.h +++ b/src/beast/beast/crypto/UnsignedInteger.h @@ -20,13 +20,13 @@ #ifndef BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED #define BEAST_CRYPTO_UNSIGNEDINTEGER_H_INCLUDED -#include "UnsignedIntegerCalc.h" -#include "MurmurHash.h" +#include +#include -#include "../ByteOrder.h" -#include "../container/hardened_hash.h" +#include +#include -#include "../utility/noexcept.h" +#include #include #include #include diff --git a/src/beast/beast/crypto/UnsignedIntegerCalc.h b/src/beast/beast/crypto/UnsignedIntegerCalc.h index d4e1b8ac5e..53c88381bc 100644 --- a/src/beast/beast/crypto/UnsignedIntegerCalc.h +++ b/src/beast/beast/crypto/UnsignedIntegerCalc.h @@ -20,7 +20,7 @@ #ifndef BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED #define BEAST_CRYPTO_UNSIGNEDINTEGERCALC_H_INCLUDED -#include "../ByteOrder.h" +#include #include #include diff --git a/src/beast/beast/crypto/impl/MurmurHash.cpp b/src/beast/beast/crypto/impl/MurmurHash.cpp index 4b92e563c2..3063b15a7d 100644 --- a/src/beast/beast/crypto/impl/MurmurHash.cpp +++ b/src/beast/beast/crypto/impl/MurmurHash.cpp @@ -19,7 +19,7 @@ // http://code.google.com/p/smhasher/ -#include "../MurmurHash.h" +#include #include diff --git a/src/beast/beast/crypto/impl/Sha256.cpp b/src/beast/beast/crypto/impl/Sha256.cpp index 4fec4b7661..0427120c4d 100644 --- a/src/beast/beast/crypto/impl/Sha256.cpp +++ b/src/beast/beast/crypto/impl/Sha256.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../Sha256.h" +#include namespace beast { namespace Sha256 { @@ -39,7 +39,7 @@ namespace Sha256 { //#define SHA2_USE_INTTYPES_H namespace detail { -#include "sha2/sha2.c" +#include } Context::Context () diff --git a/src/beast/beast/crypto/impl/UnsignedInteger.cpp b/src/beast/beast/crypto/impl/UnsignedInteger.cpp index a35bb2d5f0..a2b36da343 100644 --- a/src/beast/beast/crypto/impl/UnsignedInteger.cpp +++ b/src/beast/beast/crypto/impl/UnsignedInteger.cpp @@ -20,9 +20,9 @@ */ //============================================================================== -#include "../UnsignedInteger.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/crypto/tests/BinaryEncoding.cpp b/src/beast/beast/crypto/tests/BinaryEncoding.cpp index 69e611e7c7..2457814245 100644 --- a/src/beast/beast/crypto/tests/BinaryEncoding.cpp +++ b/src/beast/beast/crypto/tests/BinaryEncoding.cpp @@ -18,11 +18,11 @@ //============================================================================== // MODULES: ../../../modules/beast_core/beast_core.beast_core.unity.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp -#include "../BinaryEncoding.h" -#include "../UnsignedInteger.h" +#include +#include -#include "../../unit_test/suite.h" -#include "../../../modules/beast_core/maths/Random.h" +#include +#include #include #include diff --git a/src/beast/beast/crypto/tests/UnsignedInteger.test.cpp b/src/beast/beast/crypto/tests/UnsignedInteger.test.cpp index 2263e61e94..173b8892d0 100644 --- a/src/beast/beast/crypto/tests/UnsignedInteger.test.cpp +++ b/src/beast/beast/crypto/tests/UnsignedInteger.test.cpp @@ -20,9 +20,9 @@ */ //============================================================================== -#include "../UnsignedInteger.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/cxx14/algorithm.h b/src/beast/beast/cxx14/algorithm.h index f10bd7bb99..49e906c443 100644 --- a/src/beast/beast/cxx14/algorithm.h +++ b/src/beast/beast/cxx14/algorithm.h @@ -20,8 +20,8 @@ #ifndef BEAST_CXX14_ALGORITHM_H_INCLUDED #define BEAST_CXX14_ALGORITHM_H_INCLUDED -#include "config.h" -#include "functional.h" +#include +#include #include diff --git a/src/beast/beast/cxx14/cxx14.unity.cpp b/src/beast/beast/cxx14/cxx14.unity.cpp index 592b7448de..1fbfe8eb92 100644 --- a/src/beast/beast/cxx14/cxx14.unity.cpp +++ b/src/beast/beast/cxx14/cxx14.unity.cpp @@ -17,4 +17,4 @@ */ //============================================================================== -#include "tests/integer_sequence.test.cpp" +#include diff --git a/src/beast/beast/cxx14/functional.h b/src/beast/beast/cxx14/functional.h index 35946b8817..f1e217f043 100644 --- a/src/beast/beast/cxx14/functional.h +++ b/src/beast/beast/cxx14/functional.h @@ -20,7 +20,7 @@ #ifndef BEAST_CXX14_FUNCTIONAL_H_INCLUDED #define BEAST_CXX14_FUNCTIONAL_H_INCLUDED -#include "config.h" +#include #include #include diff --git a/src/beast/beast/cxx14/iterator.h b/src/beast/beast/cxx14/iterator.h index e242997dd9..ee02471cf8 100644 --- a/src/beast/beast/cxx14/iterator.h +++ b/src/beast/beast/cxx14/iterator.h @@ -20,7 +20,7 @@ #ifndef BEAST_CXX14_ITERATOR_H_INCLUDED #define BEAST_CXX14_ITERATOR_H_INCLUDED -#include "config.h" +#include #include diff --git a/src/beast/beast/cxx14/memory.h b/src/beast/beast/cxx14/memory.h index 38430cd2e5..d229000bd2 100644 --- a/src/beast/beast/cxx14/memory.h +++ b/src/beast/beast/cxx14/memory.h @@ -20,7 +20,7 @@ #ifndef BEAST_CXX14_MEMORY_H_INCLUDED #define BEAST_CXX14_MEMORY_H_INCLUDED -#include "config.h" +#include #include diff --git a/src/beast/beast/cxx14/tests/integer_sequence.test.cpp b/src/beast/beast/cxx14/tests/integer_sequence.test.cpp index f7360baa28..77d4eafdd3 100644 --- a/src/beast/beast/cxx14/tests/integer_sequence.test.cpp +++ b/src/beast/beast/cxx14/tests/integer_sequence.test.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../utility.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { namespace asio { diff --git a/src/beast/beast/cxx14/type_traits.h b/src/beast/beast/cxx14/type_traits.h index cc86df938c..30f8b69207 100644 --- a/src/beast/beast/cxx14/type_traits.h +++ b/src/beast/beast/cxx14/type_traits.h @@ -20,7 +20,7 @@ #ifndef BEAST_CXX14_TYPE_TRAITS_H_INCLUDED #define BEAST_CXX14_TYPE_TRAITS_H_INCLUDED -#include "config.h" +#include #include #include diff --git a/src/beast/beast/cxx14/utility.h b/src/beast/beast/cxx14/utility.h index 80afe8d615..fa882c2aa4 100644 --- a/src/beast/beast/cxx14/utility.h +++ b/src/beast/beast/cxx14/utility.h @@ -20,7 +20,7 @@ #ifndef BEAST_CXX14_UTILITY_H_INCLUDED #define BEAST_CXX14_UTILITY_H_INCLUDED -#include "config.h" +#include #include #include diff --git a/src/beast/beast/http/HTTP.unity.cpp b/src/beast/beast/http/HTTP.unity.cpp index e6f397c920..6230dc446d 100644 --- a/src/beast/beast/http/HTTP.unity.cpp +++ b/src/beast/beast/http/HTTP.unity.cpp @@ -18,17 +18,17 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/basic_url.cpp" -#include "impl/get.cpp" -#include "impl/joyent_parser.cpp" -#include "impl/ParsedURL.cpp" -#include "impl/raw_parser.cpp" -#include "impl/URL.cpp" +#include +#include +#include +#include +#include +#include -#include "tests/basic_url.test.cpp" -#include "tests/client_session.test.cpp" -#include "tests/ParsedURL.cpp" -#include "tests/urls_large_data.cpp" +#include +#include +#include +#include diff --git a/src/beast/beast/http/ParsedURL.h b/src/beast/beast/http/ParsedURL.h index 69ca4a0746..a2ba305e3a 100644 --- a/src/beast/beast/http/ParsedURL.h +++ b/src/beast/beast/http/ParsedURL.h @@ -20,8 +20,8 @@ #ifndef BEAST_HTTP_PARSEDURL_H_INCLUDED #define BEAST_HTTP_PARSEDURL_H_INCLUDED -#include "../Strings.h" -#include "URL.h" +#include +#include namespace beast { diff --git a/src/beast/beast/http/URL.h b/src/beast/beast/http/URL.h index 1e0e114c90..c8bdfb3d2d 100644 --- a/src/beast/beast/http/URL.h +++ b/src/beast/beast/http/URL.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_URL_H_INCLUDED #define BEAST_HTTP_URL_H_INCLUDED -#include "../strings/String.h" +#include #include diff --git a/src/beast/beast/http/basic_url.h b/src/beast/beast/http/basic_url.h index 7dabc89654..f5593feedd 100644 --- a/src/beast/beast/http/basic_url.h +++ b/src/beast/beast/http/basic_url.h @@ -23,7 +23,7 @@ #include #include -#include "../utility/noexcept.h" +#include #include #include #include diff --git a/src/beast/beast/http/client_session.h b/src/beast/beast/http/client_session.h index 709a86f6d3..633ea03afa 100644 --- a/src/beast/beast/http/client_session.h +++ b/src/beast/beast/http/client_session.h @@ -20,16 +20,16 @@ #ifndef BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED #define BEAST_ASIO_HTTP_BASIC_SESSION_H_INCLUDED -#include "basic_url.h" -#include "raw_parser.h" -#include "detail/header_traits.h" +#include +#include +#include -#include "../asio/bind_handler.h" -#include "../asio/enable_wait_for_async.h" -#include "../asio/placeholders.h" -#include "../asio/shared_handler.h" -#include "../utility/is_call_possible.h" -#include "../utility/ci_char_traits.h" +#include +#include +#include +#include +#include +#include #include #include @@ -42,8 +42,8 @@ #include #include -#include "../cxx14/memory.h" // -#include "../cxx14/type_traits.h" // +#include // +#include // #include // REMOVE ASAP! diff --git a/src/beast/beast/http/detail/header_traits.h b/src/beast/beast/http/detail/header_traits.h index 4284dca38d..c1f09f5d21 100644 --- a/src/beast/beast/http/detail/header_traits.h +++ b/src/beast/beast/http/detail/header_traits.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_HEADER_TRAITS_H_INCLUDED #define BEAST_HTTP_HEADER_TRAITS_H_INCLUDED -#include "../../utility/ci_char_traits.h" +#include #include diff --git a/src/beast/beast/http/impl/ParsedURL.cpp b/src/beast/beast/http/impl/ParsedURL.cpp index f889f39830..1bba014097 100644 --- a/src/beast/beast/http/impl/ParsedURL.cpp +++ b/src/beast/beast/http/impl/ParsedURL.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../ParsedURL.h" -#include "../../strings/String.h" +#include +#include -#include "joyent_parser.h" +#include #include diff --git a/src/beast/beast/http/impl/URL.cpp b/src/beast/beast/http/impl/URL.cpp index 4aa3810e7d..d1e772ebc1 100644 --- a/src/beast/beast/http/impl/URL.cpp +++ b/src/beast/beast/http/impl/URL.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../URL.h" +#include namespace beast { diff --git a/src/beast/beast/http/impl/basic_url.cpp b/src/beast/beast/http/impl/basic_url.cpp index 0afdb1c6ac..a05bfa43b1 100644 --- a/src/beast/beast/http/impl/basic_url.cpp +++ b/src/beast/beast/http/impl/basic_url.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../basic_url.h" +#include -#include "joyent_parser.h" +#include namespace beast { namespace http { diff --git a/src/beast/beast/http/impl/get.cpp b/src/beast/beast/http/impl/get.cpp index 4318fbae28..3079742190 100644 --- a/src/beast/beast/http/impl/get.cpp +++ b/src/beast/beast/http/impl/get.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../get.h" +#include -#include "../basic_url.h" +#include namespace beast { namespace http { diff --git a/src/beast/beast/http/impl/joyent_parser.cpp b/src/beast/beast/http/impl/joyent_parser.cpp index 40448b5a14..e58e0f6005 100644 --- a/src/beast/beast/http/impl/joyent_parser.cpp +++ b/src/beast/beast/http/impl/joyent_parser.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "joyent_parser.h" +#include -#include "../basic_message.h" +#include #include @@ -31,7 +31,7 @@ namespace joyent { # pragma warning (disable: 4127) // conditional expression is constant # pragma warning (disable: 4244) // integer conversion, possible loss of data #endif -#include "http-parser/http_parser.c" +#include #ifdef _MSC_VER # pragma warning (pop) #endif diff --git a/src/beast/beast/http/impl/joyent_parser.h b/src/beast/beast/http/impl/joyent_parser.h index e65baeb848..cdd309ca4e 100644 --- a/src/beast/beast/http/impl/joyent_parser.h +++ b/src/beast/beast/http/impl/joyent_parser.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_JOYENT_PARSER_H_INCLUDED #define BEAST_HTTP_JOYENT_PARSER_H_INCLUDED -#include "../basic_message.h" +#include // TODO Use #include @@ -30,7 +30,7 @@ namespace beast { namespace joyent { -#include "http-parser/http_parser.h" +#include http::method::methodc_t convert_http_method (joyent::http_method m); diff --git a/src/beast/beast/http/impl/raw_parser.cpp b/src/beast/beast/http/impl/raw_parser.cpp index cecf1d84b5..340a777c9b 100644 --- a/src/beast/beast/http/impl/raw_parser.cpp +++ b/src/beast/beast/http/impl/raw_parser.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../raw_parser.h" +#include -#include "joyent_parser.h" +#include #include diff --git a/src/beast/beast/http/raw_parser.h b/src/beast/beast/http/raw_parser.h index 69c4dfda6b..cc87d07af1 100644 --- a/src/beast/beast/http/raw_parser.h +++ b/src/beast/beast/http/raw_parser.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_RAW_PARSER_H_INCLUDED #define BEAST_HTTP_RAW_PARSER_H_INCLUDED -#include "../utility/empty_base_optimization.h" +#include #include // change to soon diff --git a/src/beast/beast/http/tests/ParsedURL.cpp b/src/beast/beast/http/tests/ParsedURL.cpp index ca236210de..8e2fe02e66 100644 --- a/src/beast/beast/http/tests/ParsedURL.cpp +++ b/src/beast/beast/http/tests/ParsedURL.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../ParsedURL.h" +#include -#include "../../unit_test/suite.h" +#include -#include "../impl/joyent_parser.h" +#include namespace beast { diff --git a/src/beast/beast/http/tests/basic_message.test.cpp b/src/beast/beast/http/tests/basic_message.test.cpp index 15ecb0281f..ebc0361286 100644 --- a/src/beast/beast/http/tests/basic_message.test.cpp +++ b/src/beast/beast/http/tests/basic_message.test.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" #endif -#include "../../unit_test/suite.h" +#include namespace beast { namespace http { diff --git a/src/beast/beast/http/tests/basic_url.test.cpp b/src/beast/beast/http/tests/basic_url.test.cpp index 24e6c24cdd..d077663bec 100644 --- a/src/beast/beast/http/tests/basic_url.test.cpp +++ b/src/beast/beast/http/tests/basic_url.test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../basic_url.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/http/tests/client_session.test.cpp b/src/beast/beast/http/tests/client_session.test.cpp index 044d692d22..85b11020c8 100644 --- a/src/beast/beast/http/tests/client_session.test.cpp +++ b/src/beast/beast/http/tests/client_session.test.cpp @@ -24,14 +24,14 @@ #include "../../BeastConfig.h" #endif -#include "../../unit_test/suite.h" +#include -#include "urls_large_data.h" -#include "../client_session.h" -#include "../get.h" -#include "../../asio/bind_handler.h" -#include "../../asio/memory_buffer.h" -#include "../../utility/ci_char_traits.h" +#include +#include +#include +#include +#include +#include #include diff --git a/src/beast/beast/http/tests/urls_large_data.cpp b/src/beast/beast/http/tests/urls_large_data.cpp index 07940651e3..2a870a3187 100644 --- a/src/beast/beast/http/tests/urls_large_data.cpp +++ b/src/beast/beast/http/tests/urls_large_data.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "urls_large_data.h" +#include namespace beast { namespace http { diff --git a/src/beast/beast/insight/Collector.h b/src/beast/beast/insight/Collector.h index 6325ad37b5..3b72174da3 100644 --- a/src/beast/beast/insight/Collector.h +++ b/src/beast/beast/insight/Collector.h @@ -20,11 +20,11 @@ #ifndef BEAST_INSIGHT_COLLECTOR_H_INCLUDED #define BEAST_INSIGHT_COLLECTOR_H_INCLUDED -#include "Counter.h" -#include "Event.h" -#include "Gauge.h" -#include "Hook.h" -#include "Meter.h" +#include +#include +#include +#include +#include #include diff --git a/src/beast/beast/insight/Counter.h b/src/beast/beast/insight/Counter.h index 2da422261f..8086bc58b0 100644 --- a/src/beast/beast/insight/Counter.h +++ b/src/beast/beast/insight/Counter.h @@ -20,8 +20,8 @@ #ifndef BEAST_INSIGHT_COUNTER_H_INCLUDED #define BEAST_INSIGHT_COUNTER_H_INCLUDED -#include "Base.h" -#include "CounterImpl.h" +#include +#include #include diff --git a/src/beast/beast/insight/CounterImpl.h b/src/beast/beast/insight/CounterImpl.h index 61f150509d..3bc11f9617 100644 --- a/src/beast/beast/insight/CounterImpl.h +++ b/src/beast/beast/insight/CounterImpl.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED #define BEAST_INSIGHT_COUNTERIMPL_H_INCLUDED -#include "BaseImpl.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/Event.h b/src/beast/beast/insight/Event.h index 52189a505b..c3a166f0f3 100644 --- a/src/beast/beast/insight/Event.h +++ b/src/beast/beast/insight/Event.h @@ -20,10 +20,10 @@ #ifndef BEAST_INSIGHT_EVENT_H_INCLUDED #define BEAST_INSIGHT_EVENT_H_INCLUDED -#include "Base.h" -#include "EventImpl.h" +#include +#include -#include "../chrono/chrono_util.h" +#include #include #include diff --git a/src/beast/beast/insight/EventImpl.h b/src/beast/beast/insight/EventImpl.h index 4113d59daf..7611b29873 100644 --- a/src/beast/beast/insight/EventImpl.h +++ b/src/beast/beast/insight/EventImpl.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_EVENTIMPL_H_INCLUDED #define BEAST_INSIGHT_EVENTIMPL_H_INCLUDED -#include "BaseImpl.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/Gauge.h b/src/beast/beast/insight/Gauge.h index d02a68d345..3c296f09a3 100644 --- a/src/beast/beast/insight/Gauge.h +++ b/src/beast/beast/insight/Gauge.h @@ -20,8 +20,8 @@ #ifndef BEAST_INSIGHT_GAUGE_H_INCLUDED #define BEAST_INSIGHT_GAUGE_H_INCLUDED -#include "Base.h" -#include "GaugeImpl.h" +#include +#include #include diff --git a/src/beast/beast/insight/GaugeImpl.h b/src/beast/beast/insight/GaugeImpl.h index 081c534b3b..9d19a567d5 100644 --- a/src/beast/beast/insight/GaugeImpl.h +++ b/src/beast/beast/insight/GaugeImpl.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED #define BEAST_INSIGHT_GAUGEIMPL_H_INCLUDED -#include "BaseImpl.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/Group.h b/src/beast/beast/insight/Group.h index f47c72a226..858f8c3b4a 100644 --- a/src/beast/beast/insight/Group.h +++ b/src/beast/beast/insight/Group.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_GROUP_H_INCLUDED #define BEAST_INSIGHT_GROUP_H_INCLUDED -#include "Collector.h" +#include #include #include diff --git a/src/beast/beast/insight/Groups.h b/src/beast/beast/insight/Groups.h index be4f297606..4321869d82 100644 --- a/src/beast/beast/insight/Groups.h +++ b/src/beast/beast/insight/Groups.h @@ -20,8 +20,8 @@ #ifndef BEAST_INSIGHT_GROUPS_H_INCLUDED #define BEAST_INSIGHT_GROUPS_H_INCLUDED -#include "Collector.h" -#include "Group.h" +#include +#include #include #include diff --git a/src/beast/beast/insight/Hook.h b/src/beast/beast/insight/Hook.h index 696fe6815a..1940189f34 100644 --- a/src/beast/beast/insight/Hook.h +++ b/src/beast/beast/insight/Hook.h @@ -20,8 +20,8 @@ #ifndef BEAST_INSIGHT_HOOK_H_INCLUDED #define BEAST_INSIGHT_HOOK_H_INCLUDED -#include "Base.h" -#include "HookImpl.h" +#include +#include #include diff --git a/src/beast/beast/insight/HookImpl.h b/src/beast/beast/insight/HookImpl.h index 78ecb0e4ea..4b9ab72042 100644 --- a/src/beast/beast/insight/HookImpl.h +++ b/src/beast/beast/insight/HookImpl.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_HOOKIMPL_H_INCLUDED #define BEAST_INSIGHT_HOOKIMPL_H_INCLUDED -#include "BaseImpl.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/Insight.unity.cpp b/src/beast/beast/insight/Insight.unity.cpp index 5ab9a4df6b..5439b2f7e9 100644 --- a/src/beast/beast/insight/Insight.unity.cpp +++ b/src/beast/beast/insight/Insight.unity.cpp @@ -18,17 +18,17 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "../Config.h" +#include -#include "../Insight.h" +#include -#include "impl/Collector.cpp" -#include "impl/Group.cpp" -#include "impl/Groups.cpp" -#include "impl/Hook.cpp" -#include "impl/Metric.cpp" -#include "impl/NullCollector.cpp" -#include "impl/StatsDCollector.cpp" +#include +#include +#include +#include +#include +#include +#include diff --git a/src/beast/beast/insight/Meter.h b/src/beast/beast/insight/Meter.h index 2cf3d38efe..b8cde62a6d 100644 --- a/src/beast/beast/insight/Meter.h +++ b/src/beast/beast/insight/Meter.h @@ -22,8 +22,8 @@ #include -#include "Base.h" -#include "MeterImpl.h" +#include +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/MeterImpl.h b/src/beast/beast/insight/MeterImpl.h index 301f86e638..de354722a2 100644 --- a/src/beast/beast/insight/MeterImpl.h +++ b/src/beast/beast/insight/MeterImpl.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_METERIMPL_H_INCLUDED #define BEAST_INSIGHT_METERIMPL_H_INCLUDED -#include "BaseImpl.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/NullCollector.h b/src/beast/beast/insight/NullCollector.h index d0b117b2e4..617b71bf17 100644 --- a/src/beast/beast/insight/NullCollector.h +++ b/src/beast/beast/insight/NullCollector.h @@ -20,7 +20,7 @@ #ifndef BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED #define BEAST_INSIGHT_NULLCOLLECTOR_H_INCLUDED -#include "Collector.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/StatsDCollector.h b/src/beast/beast/insight/StatsDCollector.h index ea5bf61ee5..c078921ec8 100644 --- a/src/beast/beast/insight/StatsDCollector.h +++ b/src/beast/beast/insight/StatsDCollector.h @@ -20,10 +20,10 @@ #ifndef BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED #define BEAST_INSIGHT_STATSDCOLLECTOR_H_INCLUDED -#include "Collector.h" +#include -#include "../utility/Journal.h" -#include "../net/IPEndpoint.h" +#include +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/impl/Groups.cpp b/src/beast/beast/insight/impl/Groups.cpp index a20728cc97..430052d953 100644 --- a/src/beast/beast/insight/impl/Groups.cpp +++ b/src/beast/beast/insight/impl/Groups.cpp @@ -19,7 +19,7 @@ #include -#include "../../cxx14/memory.h" +#include namespace beast { namespace insight { diff --git a/src/beast/beast/insight/impl/StatsDCollector.cpp b/src/beast/beast/insight/impl/StatsDCollector.cpp index cc54769337..8d1b1d7828 100644 --- a/src/beast/beast/insight/impl/StatsDCollector.cpp +++ b/src/beast/beast/insight/impl/StatsDCollector.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../asio/IPAddressConversion.h" -#include "../../intrusive/List.h" -#include "../../threads/SharedData.h" +#include +#include +#include #include #include diff --git a/src/beast/beast/intrusive/List.h b/src/beast/beast/intrusive/List.h index 50702a1a14..3f4e01aa6a 100644 --- a/src/beast/beast/intrusive/List.h +++ b/src/beast/beast/intrusive/List.h @@ -20,8 +20,8 @@ #ifndef BEAST_INTRUSIVE_LIST_H_INCLUDED #define BEAST_INTRUSIVE_LIST_H_INCLUDED -#include "../Config.h" -#include "../Uncopyable.h" +#include +#include #include #include diff --git a/src/beast/beast/intrusive/LockFreeStack.h b/src/beast/beast/intrusive/LockFreeStack.h index c4452bec0e..519ca80305 100644 --- a/src/beast/beast/intrusive/LockFreeStack.h +++ b/src/beast/beast/intrusive/LockFreeStack.h @@ -20,8 +20,8 @@ #ifndef BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED #define BEAST_INTRUSIVE_LOCKFREESTACK_H_INCLUDED -#include "../Atomic.h" -#include "../Uncopyable.h" +#include +#include #include #include diff --git a/src/beast/beast/net/IPAddress.h b/src/beast/beast/net/IPAddress.h index 2303c62eb9..41ce4d1fbf 100644 --- a/src/beast/beast/net/IPAddress.h +++ b/src/beast/beast/net/IPAddress.h @@ -20,9 +20,9 @@ #ifndef BEAST_NET_IPADDRESS_H_INCLUDED #define BEAST_NET_IPADDRESS_H_INCLUDED -#include "IPAddressV4.h" -#include "IPAddressV6.h" -#include "../container/hash_append.h" +#include +#include +#include #include #include diff --git a/src/beast/beast/net/IPAddressV4.h b/src/beast/beast/net/IPAddressV4.h index 41e405fe4a..ebb3a97469 100644 --- a/src/beast/beast/net/IPAddressV4.h +++ b/src/beast/beast/net/IPAddressV4.h @@ -20,7 +20,7 @@ #ifndef BEAST_NET_IPADDRESSV4_H_INCLUDED #define BEAST_NET_IPADDRESSV4_H_INCLUDED -#include "../container/hash_append.h" +#include #include #include diff --git a/src/beast/beast/net/IPEndpoint.h b/src/beast/beast/net/IPEndpoint.h index 193881f7a3..41a147f54d 100644 --- a/src/beast/beast/net/IPEndpoint.h +++ b/src/beast/beast/net/IPEndpoint.h @@ -20,8 +20,8 @@ #ifndef BEAST_NET_IPENDPOINT_H_INCLUDED #define BEAST_NET_IPENDPOINT_H_INCLUDED -#include "IPAddress.h" -#include "../container/hash_append.h" +#include +#include #include #include diff --git a/src/beast/beast/net/Net.unity.cpp b/src/beast/beast/net/Net.unity.cpp index d65e14aa68..eec68a8378 100644 --- a/src/beast/beast/net/Net.unity.cpp +++ b/src/beast/beast/net/Net.unity.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../Config.h" +#include -#include "impl/DynamicBuffer.cpp" -#include "impl/IPAddressV4.cpp" -#include "impl/IPAddressV6.cpp" -#include "impl/IPEndpoint.cpp" +#include +#include +#include +#include -#include "tests/IPEndpoint.test.cpp" +#include diff --git a/src/beast/beast/net/impl/DynamicBuffer.cpp b/src/beast/beast/net/impl/DynamicBuffer.cpp index 459c2231d3..dc9d26cd3a 100644 --- a/src/beast/beast/net/impl/DynamicBuffer.cpp +++ b/src/beast/beast/net/impl/DynamicBuffer.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" #endif -#include "../DynamicBuffer.h" +#include #include #include diff --git a/src/beast/beast/net/impl/IPAddressV4.cpp b/src/beast/beast/net/impl/IPAddressV4.cpp index da2bf7f614..69f08cce89 100644 --- a/src/beast/beast/net/impl/IPAddressV4.cpp +++ b/src/beast/beast/net/impl/IPAddressV4.cpp @@ -21,8 +21,8 @@ #include "../../BeastConfig.h" #endif -#include "../IPAddressV4.h" -#include "../detail/Parse.h" +#include +#include #include #include diff --git a/src/beast/beast/net/impl/IPAddressV6.cpp b/src/beast/beast/net/impl/IPAddressV6.cpp index f079875dea..62f72b9f1f 100644 --- a/src/beast/beast/net/impl/IPAddressV6.cpp +++ b/src/beast/beast/net/impl/IPAddressV6.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" #endif -#include "../IPAddressV6.h" +#include namespace beast { namespace IP { diff --git a/src/beast/beast/net/impl/IPEndpoint.cpp b/src/beast/beast/net/impl/IPEndpoint.cpp index f401c3159d..1f07492397 100644 --- a/src/beast/beast/net/impl/IPEndpoint.cpp +++ b/src/beast/beast/net/impl/IPEndpoint.cpp @@ -21,8 +21,8 @@ #include "../../BeastConfig.h" #endif -#include "../IPEndpoint.h" -#include "../detail/Parse.h" +#include +#include namespace beast { namespace IP { diff --git a/src/beast/beast/net/tests/IPEndpoint.test.cpp b/src/beast/beast/net/tests/IPEndpoint.test.cpp index e32784d2bf..748a92cba7 100644 --- a/src/beast/beast/net/tests/IPEndpoint.test.cpp +++ b/src/beast/beast/net/tests/IPEndpoint.test.cpp @@ -23,10 +23,10 @@ #include "../../BeastConfig.h" #endif -#include "../IPEndpoint.h" -#include "../detail/Parse.h" +#include +#include -#include "../../unit_test/suite.h" +#include #include diff --git a/src/beast/beast/smart_ptr/ScopedPointer.h b/src/beast/beast/smart_ptr/ScopedPointer.h index 3e1cf791b3..aa3bd0eda2 100644 --- a/src/beast/beast/smart_ptr/ScopedPointer.h +++ b/src/beast/beast/smart_ptr/ScopedPointer.h @@ -24,11 +24,11 @@ #ifndef BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED #define BEAST_SMARTPTR_SCOPEDPOINTER_H_INCLUDED -#include "../Config.h" -#include "../Uncopyable.h" -#include "../StaticAssert.h" +#include +#include +#include -#include "ContainerDeletePolicy.h" +#include namespace beast { diff --git a/src/beast/beast/smart_ptr/SharedObject.h b/src/beast/beast/smart_ptr/SharedObject.h index fa0d5ad737..1ceca91dd4 100644 --- a/src/beast/beast/smart_ptr/SharedObject.h +++ b/src/beast/beast/smart_ptr/SharedObject.h @@ -26,8 +26,8 @@ #include -#include "../Config.h" -#include "../Uncopyable.h" +#include +#include namespace beast { diff --git a/src/beast/beast/smart_ptr/SharedPtr.h b/src/beast/beast/smart_ptr/SharedPtr.h index 36370897f6..e1c5f70d2b 100644 --- a/src/beast/beast/smart_ptr/SharedPtr.h +++ b/src/beast/beast/smart_ptr/SharedPtr.h @@ -24,8 +24,8 @@ #ifndef BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED #define BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED -#include "../Config.h" -#include "SharedObject.h" +#include +#include namespace beast { diff --git a/src/beast/beast/streams/abstract_ostream.h b/src/beast/beast/streams/abstract_ostream.h index 2063f219e1..6ff1307371 100644 --- a/src/beast/beast/streams/abstract_ostream.h +++ b/src/beast/beast/streams/abstract_ostream.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED #define BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED -#include "basic_abstract_ostream.h" +#include namespace beast { diff --git a/src/beast/beast/streams/basic_abstract_ostream.h b/src/beast/beast/streams/basic_abstract_ostream.h index a3ff5e3fa9..7d1932a5e1 100644 --- a/src/beast/beast/streams/basic_abstract_ostream.h +++ b/src/beast/beast/streams/basic_abstract_ostream.h @@ -20,7 +20,7 @@ #ifndef BEAST_STREAMS_BASIC_ABSTRACT_OSTREAM_H_INCLUDED #define BEAST_STREAMS_BASIC_ABSTRACT_OSTREAM_H_INCLUDED -#include "basic_scoped_ostream.h" +#include #include #include diff --git a/src/beast/beast/streams/basic_scoped_ostream.h b/src/beast/beast/streams/basic_scoped_ostream.h index d1a001ada5..861cf01291 100644 --- a/src/beast/beast/streams/basic_scoped_ostream.h +++ b/src/beast/beast/streams/basic_scoped_ostream.h @@ -20,7 +20,7 @@ #ifndef BEAST_STREAMS_BASIC_SCOPED_OSTREAM_H_INCLUDED #define BEAST_STREAMS_BASIC_SCOPED_OSTREAM_H_INCLUDED -#include "../cxx14/memory.h" // +#include // #include #include diff --git a/src/beast/beast/streams/basic_std_ostream.h b/src/beast/beast/streams/basic_std_ostream.h index 677eb39bbd..b8933fa103 100644 --- a/src/beast/beast/streams/basic_std_ostream.h +++ b/src/beast/beast/streams/basic_std_ostream.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_STD_OSTREAM_H_INCLUDED #define BEAST_UTILITY_STD_OSTREAM_H_INCLUDED -#include "basic_abstract_ostream.h" +#include #include diff --git a/src/beast/beast/streams/debug_ostream.h b/src/beast/beast/streams/debug_ostream.h index d9f12ea18a..6e23d22ab8 100644 --- a/src/beast/beast/streams/debug_ostream.h +++ b/src/beast/beast/streams/debug_ostream.h @@ -20,17 +20,17 @@ #ifndef BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED #define BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED -#include "abstract_ostream.h" +#include #include #ifdef _MSC_VER # ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN -# include +#include # undef WIN32_LEAN_AND_MEAN # else -# include +#include # endif # ifdef min # undef min diff --git a/src/beast/beast/streams/streams.unity.cpp b/src/beast/beast/streams/streams.unity.cpp index a957415919..f997894530 100644 --- a/src/beast/beast/streams/streams.unity.cpp +++ b/src/beast/beast/streams/streams.unity.cpp @@ -17,4 +17,4 @@ */ //============================================================================== -#include "tests/basic_abstract_ostream.test.cpp" +#include diff --git a/src/beast/beast/streams/tests/basic_abstract_ostream.test.cpp b/src/beast/beast/streams/tests/basic_abstract_ostream.test.cpp index 1ef7687a92..df2ea3c021 100644 --- a/src/beast/beast/streams/tests/basic_abstract_ostream.test.cpp +++ b/src/beast/beast/streams/tests/basic_abstract_ostream.test.cpp @@ -21,9 +21,9 @@ #include "../../BeastConfig.h" #endif -#include "../basic_abstract_ostream.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/strings/CharPointer_ASCII.h b/src/beast/beast/strings/CharPointer_ASCII.h index 48e96bb46c..a61c171ce5 100644 --- a/src/beast/beast/strings/CharPointer_ASCII.h +++ b/src/beast/beast/strings/CharPointer_ASCII.h @@ -24,9 +24,9 @@ #ifndef BEAST_CHARPOINTER_ASCII_H_INCLUDED #define BEAST_CHARPOINTER_ASCII_H_INCLUDED -#include "../Config.h" +#include -#include "CharacterFunctions.h" +#include #include #include diff --git a/src/beast/beast/strings/CharPointer_UTF16.h b/src/beast/beast/strings/CharPointer_UTF16.h index 987989cbd1..c0afdfbe78 100644 --- a/src/beast/beast/strings/CharPointer_UTF16.h +++ b/src/beast/beast/strings/CharPointer_UTF16.h @@ -24,10 +24,10 @@ #ifndef BEAST_CHARPOINTER_UTF16_H_INCLUDED #define BEAST_CHARPOINTER_UTF16_H_INCLUDED -#include "../Config.h" -#include "../Atomic.h" +#include +#include -#include "CharacterFunctions.h" +#include #include diff --git a/src/beast/beast/strings/CharPointer_UTF32.h b/src/beast/beast/strings/CharPointer_UTF32.h index 37ab304ccb..3bf0b440f7 100644 --- a/src/beast/beast/strings/CharPointer_UTF32.h +++ b/src/beast/beast/strings/CharPointer_UTF32.h @@ -24,10 +24,10 @@ #ifndef BEAST_CHARPOINTER_UTF32_H_INCLUDED #define BEAST_CHARPOINTER_UTF32_H_INCLUDED -#include "../Config.h" -#include "../Atomic.h" +#include +#include -#include "CharacterFunctions.h" +#include #include diff --git a/src/beast/beast/strings/CharPointer_UTF8.h b/src/beast/beast/strings/CharPointer_UTF8.h index ac9f709e9f..d5e83fc03f 100644 --- a/src/beast/beast/strings/CharPointer_UTF8.h +++ b/src/beast/beast/strings/CharPointer_UTF8.h @@ -24,10 +24,10 @@ #ifndef BEAST_CHARPOINTER_UTF8_H_INCLUDED #define BEAST_CHARPOINTER_UTF8_H_INCLUDED -#include "../Config.h" -#include "../Atomic.h" +#include +#include -#include "CharacterFunctions.h" +#include #include #include diff --git a/src/beast/beast/strings/CharacterFunctions.h b/src/beast/beast/strings/CharacterFunctions.h index d05bcdd6db..b3037e24c9 100644 --- a/src/beast/beast/strings/CharacterFunctions.h +++ b/src/beast/beast/strings/CharacterFunctions.h @@ -26,8 +26,8 @@ #include -#include "../Config.h" -#include "../Memory.h" +#include +#include #include diff --git a/src/beast/beast/strings/NewLine.h b/src/beast/beast/strings/NewLine.h index 1566402d0a..ba9c0f5d4f 100644 --- a/src/beast/beast/strings/NewLine.h +++ b/src/beast/beast/strings/NewLine.h @@ -24,9 +24,9 @@ #ifndef BEAST_STRINGS_NEWLINE_H_INCLUDED #define BEAST_STRINGS_NEWLINE_H_INCLUDED -#include "../Config.h" +#include -#include "String.h" +#include namespace beast { diff --git a/src/beast/beast/strings/String.h b/src/beast/beast/strings/String.h index b49ad06e04..8924910874 100644 --- a/src/beast/beast/strings/String.h +++ b/src/beast/beast/strings/String.h @@ -24,24 +24,24 @@ #ifndef BEAST_STRINGS_STRING_H_INCLUDED #define BEAST_STRINGS_STRING_H_INCLUDED -#include "../Config.h" -#include "../Memory.h" +#include +#include -#include "CharacterFunctions.h" +#include #if BEAST_MSVC # pragma warning (push) # pragma warning (disable: 4514 4996) #endif -#include "CharPointer_UTF8.h" -#include "CharPointer_UTF16.h" -#include "CharPointer_UTF32.h" -#include "CharPointer_ASCII.h" +#include +#include +#include +#include #if BEAST_MSVC # pragma warning (pop) #endif -#include "StringCharPointerType.h" -#include "StringFromNumber.h" -#include "String.h" +#include +#include +#include #include #include diff --git a/src/beast/beast/strings/StringCharPointerType.h b/src/beast/beast/strings/StringCharPointerType.h index ef2de5ec32..ec9f457378 100644 --- a/src/beast/beast/strings/StringCharPointerType.h +++ b/src/beast/beast/strings/StringCharPointerType.h @@ -24,10 +24,10 @@ #ifndef BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED #define BEAST_STRINGS_STRINGCHARPOINTERTYPE_H_INCLUDED -#include "../Config.h" -#include "CharPointer_UTF8.h" -#include "CharPointer_UTF16.h" -#include "CharPointer_UTF32.h" +#include +#include +#include +#include namespace beast { diff --git a/src/beast/beast/strings/StringFromNumber.h b/src/beast/beast/strings/StringFromNumber.h index 21d8438b09..31ccb55a8e 100644 --- a/src/beast/beast/strings/StringFromNumber.h +++ b/src/beast/beast/strings/StringFromNumber.h @@ -24,10 +24,10 @@ #ifndef BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED #define BEAST_STRINGS_STRINGFROMNUMBER_H_INCLUDED -#include "../Config.h" -#include "../Arithmetic.h" +#include +#include -#include "StringCharPointerType.h" +#include #include #include diff --git a/src/beast/beast/strings/Strings.unity.cpp b/src/beast/beast/strings/Strings.unity.cpp index 15f2ddad1c..9ded492c8d 100644 --- a/src/beast/beast/strings/Strings.unity.cpp +++ b/src/beast/beast/strings/Strings.unity.cpp @@ -17,5 +17,5 @@ */ //============================================================================== -#include "impl/CharacterFunctions.cpp" -#include "impl/String.cpp" +#include +#include diff --git a/src/beast/beast/strings/impl/CharacterFunctions.cpp b/src/beast/beast/strings/impl/CharacterFunctions.cpp index 5121056973..313230d5c2 100644 --- a/src/beast/beast/strings/impl/CharacterFunctions.cpp +++ b/src/beast/beast/strings/impl/CharacterFunctions.cpp @@ -25,7 +25,7 @@ #include "../../BeastConfig.h" #endif -#include "../CharacterFunctions.h" +#include #include #include diff --git a/src/beast/beast/strings/impl/String.cpp b/src/beast/beast/strings/impl/String.cpp index a9e19a44a8..451e05ac62 100644 --- a/src/beast/beast/strings/impl/String.cpp +++ b/src/beast/beast/strings/impl/String.cpp @@ -25,14 +25,14 @@ #include "../../BeastConfig.h" #endif -#include "../String.h" -#include "../NewLine.h" +#include +#include -#include "../../ByteOrder.h" -#include "../../Memory.h" -#include "../../StaticAssert.h" -#include "../../Arithmetic.h" -#include "../../HeapBlock.h" +#include +#include +#include +#include +#include #include diff --git a/src/beast/beast/threads/RecursiveMutex.h b/src/beast/beast/threads/RecursiveMutex.h index 3f7cb59abb..129377cfa0 100644 --- a/src/beast/beast/threads/RecursiveMutex.h +++ b/src/beast/beast/threads/RecursiveMutex.h @@ -24,9 +24,9 @@ #ifndef BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED #define BEAST_THREADS_RECURSIVEMUTEX_H_INCLUDED -#include "../Config.h" -#include "UnlockGuard.h" -#include "TryLockGuard.h" +#include +#include +#include #include diff --git a/src/beast/beast/threads/ServiceQueue.h b/src/beast/beast/threads/ServiceQueue.h index eac6d6cfb2..3d0e60428c 100644 --- a/src/beast/beast/threads/ServiceQueue.h +++ b/src/beast/beast/threads/ServiceQueue.h @@ -20,12 +20,12 @@ #ifndef BEAST_THREADS_SERVICEQUEUE_H_INCLUDED #define BEAST_THREADS_SERVICEQUEUE_H_INCLUDED -#include "../intrusive/List.h" -#include "SharedData.h" -#include "ThreadLocalValue.h" -#include "WaitableEvent.h" +#include +#include +#include +#include -#include "detail/DispatchedHandler.h" +#include namespace beast { diff --git a/src/beast/beast/threads/SharedData.h b/src/beast/beast/threads/SharedData.h index 62e1defe72..707b98de2d 100644 --- a/src/beast/beast/threads/SharedData.h +++ b/src/beast/beast/threads/SharedData.h @@ -20,8 +20,8 @@ #ifndef BEAST_THREADS_SHAREDDATA_H_INCLUDED #define BEAST_THREADS_SHAREDDATA_H_INCLUDED -#include "RecursiveMutex.h" -#include "SharedMutexAdapter.h" +#include +#include namespace beast { diff --git a/src/beast/beast/threads/SharedLockGuard.h b/src/beast/beast/threads/SharedLockGuard.h index 82fdbd0812..da9f6b7581 100644 --- a/src/beast/beast/threads/SharedLockGuard.h +++ b/src/beast/beast/threads/SharedLockGuard.h @@ -20,7 +20,7 @@ #ifndef BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED #define BEAST_THREADS_SHAREDLOCKGUARD_H_INCLUDED -#include "../Uncopyable.h" +#include namespace beast { diff --git a/src/beast/beast/threads/SharedMutexAdapter.h b/src/beast/beast/threads/SharedMutexAdapter.h index 8147dc3a1f..4cf3f03ec8 100644 --- a/src/beast/beast/threads/SharedMutexAdapter.h +++ b/src/beast/beast/threads/SharedMutexAdapter.h @@ -20,7 +20,7 @@ #ifndef BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED #define BEAST_THREADS_SHAREDMUTEXADAPTER_H_INCLUDED -#include "SharedLockGuard.h" +#include #include diff --git a/src/beast/beast/threads/SpinLock.h b/src/beast/beast/threads/SpinLock.h index 4750911eb5..717ec2ce45 100644 --- a/src/beast/beast/threads/SpinLock.h +++ b/src/beast/beast/threads/SpinLock.h @@ -24,8 +24,8 @@ #ifndef BEAST_THREADS_SPINLOCK_H_INCLUDED #define BEAST_THREADS_SPINLOCK_H_INCLUDED -#include "../Atomic.h" -#include "UnlockGuard.h" +#include +#include #include diff --git a/src/beast/beast/threads/Stoppable.h b/src/beast/beast/threads/Stoppable.h index 9ff21dcb51..19ce34431c 100644 --- a/src/beast/beast/threads/Stoppable.h +++ b/src/beast/beast/threads/Stoppable.h @@ -20,11 +20,11 @@ #ifndef BEAST_THREADS_STOPPABLE_H_INCLUDED #define BEAST_THREADS_STOPPABLE_H_INCLUDED -#include "../Atomic.h" -#include "../intrusive/LockFreeStack.h" -#include "../utility/Journal.h" +#include +#include +#include -#include "WaitableEvent.h" +#include namespace beast { diff --git a/src/beast/beast/threads/Thread.h b/src/beast/beast/threads/Thread.h index aee57d5f0d..92443943d2 100644 --- a/src/beast/beast/threads/Thread.h +++ b/src/beast/beast/threads/Thread.h @@ -24,10 +24,10 @@ #ifndef BEAST_THREADS_THREAD_H_INCLUDED #define BEAST_THREADS_THREAD_H_INCLUDED -#include "../strings/String.h" -#include "../utility/LeakChecked.h" -#include "RecursiveMutex.h" -#include "WaitableEvent.h" +#include +#include +#include +#include namespace beast { diff --git a/src/beast/beast/threads/ThreadLocalValue.h b/src/beast/beast/threads/ThreadLocalValue.h index ac8310cd18..99bb024e4c 100644 --- a/src/beast/beast/threads/ThreadLocalValue.h +++ b/src/beast/beast/threads/ThreadLocalValue.h @@ -24,9 +24,9 @@ #ifndef BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED #define BEAST_THREADS_THREADLOCALVALUE_H_INCLUDED -#include "../Config.h" -#include "SpinLock.h" -#include "Thread.h" +#include +#include +#include namespace beast { diff --git a/src/beast/beast/threads/Threads.unity.cpp b/src/beast/beast/threads/Threads.unity.cpp index 9335269710..104f9ba558 100644 --- a/src/beast/beast/threads/Threads.unity.cpp +++ b/src/beast/beast/threads/Threads.unity.cpp @@ -18,14 +18,14 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/RecursiveMutex.cpp" -#include "impl/ServiceQueue.cpp" -#include "impl/Stoppable.cpp" -#include "impl/Thread.cpp" -#include "impl/WaitableEvent.cpp" +#include +#include +#include +#include +#include -#include "tests/Atomic.test.cpp" -#include "tests/ServiceQueue.cpp" +#include +#include diff --git a/src/beast/beast/threads/TryLockGuard.h b/src/beast/beast/threads/TryLockGuard.h index f61f8bb6e1..55afdae3f5 100644 --- a/src/beast/beast/threads/TryLockGuard.h +++ b/src/beast/beast/threads/TryLockGuard.h @@ -20,7 +20,7 @@ #ifndef BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED #define BEAST_THREADS_TRYLOCKGUARD_H_INCLUDED -#include "../Uncopyable.h" +#include namespace beast { diff --git a/src/beast/beast/threads/UnlockGuard.h b/src/beast/beast/threads/UnlockGuard.h index ea412765f6..d8f7b590c8 100644 --- a/src/beast/beast/threads/UnlockGuard.h +++ b/src/beast/beast/threads/UnlockGuard.h @@ -20,7 +20,7 @@ #ifndef BEAST_THREADS_UNLOCKGUARD_H_INCLUDED #define BEAST_THREADS_UNLOCKGUARD_H_INCLUDED -#include "../Uncopyable.h" +#include namespace beast { diff --git a/src/beast/beast/threads/WaitableEvent.h b/src/beast/beast/threads/WaitableEvent.h index 1e8b2a2cba..b78289a0b0 100644 --- a/src/beast/beast/threads/WaitableEvent.h +++ b/src/beast/beast/threads/WaitableEvent.h @@ -24,8 +24,8 @@ #ifndef BEAST_THREADS_WAITABLEEVENT_H_INCLUDED #define BEAST_THREADS_WAITABLEEVENT_H_INCLUDED -#include "../Config.h" -#include "../Uncopyable.h" +#include +#include #if ! BEAST_WINDOWS #include diff --git a/src/beast/beast/threads/detail/DispatchedHandler.h b/src/beast/beast/threads/detail/DispatchedHandler.h index 8cd1897e49..b84e465732 100644 --- a/src/beast/beast/threads/detail/DispatchedHandler.h +++ b/src/beast/beast/threads/detail/DispatchedHandler.h @@ -20,7 +20,7 @@ #ifndef BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED #define BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED -#include "BindHandler.h" +#include namespace beast { namespace detail { diff --git a/src/beast/beast/threads/impl/RecursiveMutex.cpp b/src/beast/beast/threads/impl/RecursiveMutex.cpp index 414f883c91..b5005184b1 100644 --- a/src/beast/beast/threads/impl/RecursiveMutex.cpp +++ b/src/beast/beast/threads/impl/RecursiveMutex.cpp @@ -21,12 +21,10 @@ */ //============================================================================== -#include "../RecursiveMutex.h" +#include #if BEAST_WINDOWS -#include "../StaticAssert.h" - #include #undef check #undef direct @@ -39,11 +37,7 @@ namespace beast { RecursiveMutex::RecursiveMutex() { // (just to check the MS haven't changed this structure and broken things...) -#if BEAST_VC7_OR_EARLIER - static_bassert (sizeof (CRITICAL_SECTION) <= 24); -#else - static_bassert (sizeof (CRITICAL_SECTION) <= sizeof (section)); -#endif + static_assert (sizeof (CRITICAL_SECTION) <= sizeof (section), ""); InitializeCriticalSection ((CRITICAL_SECTION*) section); } diff --git a/src/beast/beast/threads/impl/ServiceQueue.cpp b/src/beast/beast/threads/impl/ServiceQueue.cpp index 0b284e3551..44a662daf2 100644 --- a/src/beast/beast/threads/impl/ServiceQueue.cpp +++ b/src/beast/beast/threads/impl/ServiceQueue.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../ServiceQueue.h" +#include namespace beast { diff --git a/src/beast/beast/threads/impl/Stoppable.cpp b/src/beast/beast/threads/impl/Stoppable.cpp index 7c8eb891e8..f5a9fe8e27 100644 --- a/src/beast/beast/threads/impl/Stoppable.cpp +++ b/src/beast/beast/threads/impl/Stoppable.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../Stoppable.h" +#include namespace beast { diff --git a/src/beast/beast/threads/impl/Thread.cpp b/src/beast/beast/threads/impl/Thread.cpp index a9f0f8f5f8..88863e88d6 100644 --- a/src/beast/beast/threads/impl/Thread.cpp +++ b/src/beast/beast/threads/impl/Thread.cpp @@ -21,10 +21,10 @@ */ //============================================================================== -#include "../Thread.h" -#include "../../smart_ptr/SharedObject.h" -#include "../../smart_ptr/SharedPtr.h" -#include "../../../modules/beast_core/time/Time.h" +#include +#include +#include +#include #include @@ -452,11 +452,11 @@ void Thread::yield() #include #import namespace beast{ -#include "../../../modules/beast_core/native/osx_ObjCHelpers.h" +#include } #else -# include +#include #endif diff --git a/src/beast/beast/threads/impl/WaitableEvent.cpp b/src/beast/beast/threads/impl/WaitableEvent.cpp index 9e882c499b..05b85507a0 100644 --- a/src/beast/beast/threads/impl/WaitableEvent.cpp +++ b/src/beast/beast/threads/impl/WaitableEvent.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../WaitableEvent.h" +#include #if BEAST_WINDOWS diff --git a/src/beast/beast/threads/tests/Atomic.test.cpp b/src/beast/beast/threads/tests/Atomic.test.cpp index f6e7640671..c1e7cdd64a 100644 --- a/src/beast/beast/threads/tests/Atomic.test.cpp +++ b/src/beast/beast/threads/tests/Atomic.test.cpp @@ -25,11 +25,11 @@ #include "../../BeastConfig.h" #endif -#include "../../Atomic.h" -#include "../../Arithmetic.h" -#include "../../ByteOrder.h" +#include +#include +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/threads/tests/ServiceQueue.cpp b/src/beast/beast/threads/tests/ServiceQueue.cpp index 9893aa44b2..cbd12a4b1e 100644 --- a/src/beast/beast/threads/tests/ServiceQueue.cpp +++ b/src/beast/beast/threads/tests/ServiceQueue.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include "../ServiceQueue.h" +#include -#include "../../unit_test/suite.h" +#include -#include "../../../modules/beast_core/time/Time.h" -#include "../../../modules/beast_core/maths/Random.h" +#include +#include #include #include diff --git a/src/beast/beast/unit_test.h b/src/beast/beast/unit_test.h index 81764936e8..2c99801d02 100644 --- a/src/beast/beast/unit_test.h +++ b/src/beast/beast/unit_test.h @@ -20,16 +20,16 @@ #ifndef BEAST_UNIT_TEST_H_INCLUDED #define BEAST_UNIT_TEST_H_INCLUDED -#include "./unit_test/amount.h" -#include "./unit_test/print.h" -#include "./unit_test/global_suites.h" -#include "./unit_test/match.h" -#include "./unit_test/recorder.h" -#include "./unit_test/reporter.h" -#include "./unit_test/results.h" -#include "./unit_test/runner.h" -#include "./unit_test/suite.h" -#include "./unit_test/suite_info.h" -#include "./unit_test/suite_list.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/beast/beast/unit_test/define_print.cpp b/src/beast/beast/unit_test/define_print.cpp index 4777010951..00194879fc 100644 --- a/src/beast/beast/unit_test/define_print.cpp +++ b/src/beast/beast/unit_test/define_print.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "amount.h" -#include "global_suites.h" -#include "suite.h" +#include +#include +#include // Include this .cpp in your project to gain access to the printing suite diff --git a/src/beast/beast/unit_test/global_suites.h b/src/beast/beast/unit_test/global_suites.h index 8fd39d5df5..eb61b9b62e 100644 --- a/src/beast/beast/unit_test/global_suites.h +++ b/src/beast/beast/unit_test/global_suites.h @@ -20,7 +20,7 @@ #ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_H_INCLUDED #define BEAST_UNIT_TEST_GLOBAL_SUITES_H_INCLUDED -#include "suite_list.h" +#include namespace beast { namespace unit_test { diff --git a/src/beast/beast/unit_test/match.h b/src/beast/beast/unit_test/match.h index ad0d1f07cb..763c1ac655 100644 --- a/src/beast/beast/unit_test/match.h +++ b/src/beast/beast/unit_test/match.h @@ -20,7 +20,7 @@ #ifndef BEAST_UNIT_TEST_MATCH_H_INLCUDED #define BEAST_UNIT_TEST_MATCH_H_INLCUDED -#include "suite_info.h" +#include namespace beast { namespace unit_test { diff --git a/src/beast/beast/unit_test/print.h b/src/beast/beast/unit_test/print.h index b4cd355e55..db36c9f455 100644 --- a/src/beast/beast/unit_test/print.h +++ b/src/beast/beast/unit_test/print.h @@ -20,11 +20,11 @@ #ifndef BEAST_UNIT_TEST_PRINT_H_INLCUDED #define BEAST_UNIT_TEST_PRINT_H_INLCUDED -#include "amount.h" -#include "results.h" +#include +#include -#include "../streams/abstract_ostream.h" -#include "../streams/basic_std_ostream.h" +#include +#include #include #include diff --git a/src/beast/beast/unit_test/recorder.h b/src/beast/beast/unit_test/recorder.h index 565167e750..153f8f17f8 100644 --- a/src/beast/beast/unit_test/recorder.h +++ b/src/beast/beast/unit_test/recorder.h @@ -20,8 +20,8 @@ #ifndef BEAST_UNIT_TEST_RECORDER_H_INLCUDED #define BEAST_UNIT_TEST_RECORDER_H_INLCUDED -#include "results.h" -#include "runner.h" +#include +#include namespace beast { namespace unit_test { diff --git a/src/beast/beast/unit_test/reporter.h b/src/beast/beast/unit_test/reporter.h index ac2937ee23..c206ac47ef 100644 --- a/src/beast/beast/unit_test/reporter.h +++ b/src/beast/beast/unit_test/reporter.h @@ -20,11 +20,11 @@ #ifndef BEAST_UNIT_TEST_REPORTER_H_INLCUDED #define BEAST_UNIT_TEST_REPORTER_H_INLCUDED -#include "amount.h" -#include "recorder.h" +#include +#include -#include "../streams/abstract_ostream.h" -#include "../streams/basic_std_ostream.h" +#include +#include #include #include diff --git a/src/beast/beast/unit_test/results.h b/src/beast/beast/unit_test/results.h index 6dcecd84dc..d19687d080 100644 --- a/src/beast/beast/unit_test/results.h +++ b/src/beast/beast/unit_test/results.h @@ -20,7 +20,7 @@ #ifndef BEAST_UNIT_TEST_RESULTS_H_INLCUDED #define BEAST_UNIT_TEST_RESULTS_H_INLCUDED -#include "../container/const_container.h" +#include #include #include diff --git a/src/beast/beast/unit_test/runner.h b/src/beast/beast/unit_test/runner.h index d2b55e7521..d4499f3e14 100644 --- a/src/beast/beast/unit_test/runner.h +++ b/src/beast/beast/unit_test/runner.h @@ -20,9 +20,9 @@ #ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED #define BEAST_UNIT_TEST_RUNNER_H_INCLUDED -#include "suite_info.h" +#include -#include "../streams/abstract_ostream.h" +#include #include #include diff --git a/src/beast/beast/unit_test/suite.h b/src/beast/beast/unit_test/suite.h index 1bd157be1a..e905fb5650 100644 --- a/src/beast/beast/unit_test/suite.h +++ b/src/beast/beast/unit_test/suite.h @@ -20,9 +20,9 @@ #ifndef BEAST_UNIT_TEST_SUITE_H_INCLUDED #define BEAST_UNIT_TEST_SUITE_H_INCLUDED -#include "runner.h" +#include -#include "../utility/noexcept.h" +#include #include namespace beast { @@ -274,7 +274,7 @@ private: #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) #else -#include "global_suites.h" +#include #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \ BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false) #define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \ diff --git a/src/beast/beast/unit_test/suite_list.h b/src/beast/beast/unit_test/suite_list.h index 3cc534fcdf..6194e93fad 100644 --- a/src/beast/beast/unit_test/suite_list.h +++ b/src/beast/beast/unit_test/suite_list.h @@ -20,9 +20,9 @@ #ifndef BEAST_UNIT_TEST_SUITE_LIST_H_INCLUDED #define BEAST_UNIT_TEST_SUITE_LIST_H_INCLUDED -#include "suite_info.h" +#include -#include "../container/const_container.h" +#include #include //#include diff --git a/src/beast/beast/unit_test/tests/main.cpp b/src/beast/beast/unit_test/tests/main.cpp index 340b44bfca..589012a9bb 100644 --- a/src/beast/beast/unit_test/tests/main.cpp +++ b/src/beast/beast/unit_test/tests/main.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include "../../unit_test.h" -#include "../../streams/debug_ostream.h" +#include +#include #ifdef _MSC_VER # ifndef WIN32_LEAN_AND_MEAN // VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN -# include +#include # undef WIN32_LEAN_AND_MEAN # else -# include +#include # endif #endif diff --git a/src/beast/beast/utility/Debug.h b/src/beast/beast/utility/Debug.h index 0a1d5e3e0f..c1b0616a08 100644 --- a/src/beast/beast/utility/Debug.h +++ b/src/beast/beast/utility/Debug.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_DEBUG_H_INCLUDED #define BEAST_UTILITY_DEBUG_H_INCLUDED -#include "../strings/String.h" +#include namespace beast { diff --git a/src/beast/beast/utility/Error.h b/src/beast/beast/utility/Error.h index 0c095bfc29..2081eb8adb 100644 --- a/src/beast/beast/utility/Error.h +++ b/src/beast/beast/utility/Error.h @@ -20,9 +20,9 @@ #ifndef BEAST_UTILITY_ERROR_H_INCLUDED #define BEAST_UTILITY_ERROR_H_INCLUDED -#include "../Config.h" +#include -#include "../strings/String.h" +#include #include diff --git a/src/beast/beast/utility/LeakChecked.h b/src/beast/beast/utility/LeakChecked.h index 296d315efb..caf791c117 100644 --- a/src/beast/beast/utility/LeakChecked.h +++ b/src/beast/beast/utility/LeakChecked.h @@ -20,10 +20,10 @@ #ifndef BEAST_UTILITY_LEAKCHECKED_H_INCLUDED #define BEAST_UTILITY_LEAKCHECKED_H_INCLUDED -#include "../Config.h" -#include "../Atomic.h" -#include "../intrusive/LockFreeStack.h" -#include "StaticObject.h" +#include +#include +#include +#include namespace beast { diff --git a/src/beast/beast/utility/PropertyStream.h b/src/beast/beast/utility/PropertyStream.h index 480b8db4d8..f42dcf8e2c 100644 --- a/src/beast/beast/utility/PropertyStream.h +++ b/src/beast/beast/utility/PropertyStream.h @@ -20,9 +20,9 @@ #ifndef BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED #define BEAST_UTILITY_PROPERTYSTREAM_H_INCLUDED -#include "../Uncopyable.h" -#include "../intrusive/List.h" -#include "../threads/SharedData.h" +#include +#include +#include #include #include diff --git a/src/beast/beast/utility/Utility.unity.cpp b/src/beast/beast/utility/Utility.unity.cpp index a05169f91f..0b6cbe7962 100644 --- a/src/beast/beast/utility/Utility.unity.cpp +++ b/src/beast/beast/utility/Utility.unity.cpp @@ -18,18 +18,18 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "impl/Error.cpp" +#include -#include "impl/Debug.cpp" -#include "impl/Journal.cpp" -#include "impl/LeakChecked.cpp" -#include "impl/StaticObject.cpp" -#include "impl/PropertyStream.cpp" +#include +#include +#include +#include +#include -#include "tests/bassert.test.cpp" -#include "tests/empty_base_optimization.test.cpp" -#include "tests/Zero.test.cpp" -#include "tests/tagged_integer.test.cpp" +#include +#include +#include +#include diff --git a/src/beast/beast/utility/Zero.h b/src/beast/beast/utility/Zero.h index 0cd1c950b3..c09c183216 100644 --- a/src/beast/beast/utility/Zero.h +++ b/src/beast/beast/utility/Zero.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_ZERO_H_INCLUDED #define BEAST_UTILITY_ZERO_H_INCLUDED -#include "../config/CompilerConfig.h" +#include // VS2013 SP1 fails with decltype return #define BEAST_NO_ZERO_AUTO_RETURN 1 diff --git a/src/beast/beast/utility/empty_base_optimization.h b/src/beast/beast/utility/empty_base_optimization.h index 2989f0987b..4ab904b47b 100644 --- a/src/beast/beast/utility/empty_base_optimization.h +++ b/src/beast/beast/utility/empty_base_optimization.h @@ -21,7 +21,7 @@ #ifndef BEAST_UTILITY_EMPTY_BASE_OPTIMIZATION_H_INCLUDED #define BEAST_UTILITY_EMPTY_BASE_OPTIMIZATION_H_INCLUDED -#include "../utility/noexcept.h" +#include #include #include diff --git a/src/beast/beast/utility/impl/Debug.cpp b/src/beast/beast/utility/impl/Debug.cpp index 0e27385e32..69e28dfd32 100644 --- a/src/beast/beast/utility/impl/Debug.cpp +++ b/src/beast/beast/utility/impl/Debug.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../Debug.h" -#include "../../unit_test/suite.h" -#include "../../../modules/beast_core/system/SystemStats.h" +#include +#include +#include namespace beast { diff --git a/src/beast/beast/utility/impl/Error.cpp b/src/beast/beast/utility/impl/Error.cpp index 7751c41762..021a4b8389 100644 --- a/src/beast/beast/utility/impl/Error.cpp +++ b/src/beast/beast/utility/impl/Error.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../Error.h" -#include "../Debug.h" +#include +#include #include diff --git a/src/beast/beast/utility/impl/Journal.cpp b/src/beast/beast/utility/impl/Journal.cpp index 932ae6b752..7bb261e5ec 100644 --- a/src/beast/beast/utility/impl/Journal.cpp +++ b/src/beast/beast/utility/impl/Journal.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../Journal.h" -#include "../../../modules/beast_core/memory/SharedSingleton.h" +#include +#include namespace beast { diff --git a/src/beast/beast/utility/impl/LeakChecked.cpp b/src/beast/beast/utility/impl/LeakChecked.cpp index 3ac4e52040..4c9bae1927 100644 --- a/src/beast/beast/utility/impl/LeakChecked.cpp +++ b/src/beast/beast/utility/impl/LeakChecked.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../LeakChecked.h" -#include "../../../modules/beast_core/logging/Logger.h" +#include +#include namespace beast { diff --git a/src/beast/beast/utility/impl/PropertyStream.cpp b/src/beast/beast/utility/impl/PropertyStream.cpp index 7ea88bb388..a0c3ec190c 100644 --- a/src/beast/beast/utility/impl/PropertyStream.cpp +++ b/src/beast/beast/utility/impl/PropertyStream.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../PropertyStream.h" -#include "../../unit_test/suite.h" +#include +#include #include #include diff --git a/src/beast/beast/utility/impl/StaticObject.cpp b/src/beast/beast/utility/impl/StaticObject.cpp index 5b44bb0dd7..ae7a10c924 100644 --- a/src/beast/beast/utility/impl/StaticObject.cpp +++ b/src/beast/beast/utility/impl/StaticObject.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../StaticObject.h" -#include "../../threads/Thread.h" +#include +#include namespace beast { diff --git a/src/beast/beast/utility/is_call_possible.h b/src/beast/beast/utility/is_call_possible.h index 099c9fccd1..182eb11cb6 100644 --- a/src/beast/beast/utility/is_call_possible.h +++ b/src/beast/beast/utility/is_call_possible.h @@ -20,7 +20,7 @@ #ifndef BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED #define BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED -#include "../cxx14/type_traits.h" // +#include // namespace beast { diff --git a/src/beast/beast/utility/tagged_integer.h b/src/beast/beast/utility/tagged_integer.h index e4c3d8c878..39a43def64 100644 --- a/src/beast/beast/utility/tagged_integer.h +++ b/src/beast/beast/utility/tagged_integer.h @@ -20,9 +20,9 @@ #ifndef BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED #define BEAST_UTILITY_TAGGED_INTEGER_H_INCLUDED -#include "../container/hash_append.h" +#include -#include "noexcept.h" +#include #include #include diff --git a/src/beast/beast/utility/tests/Zero.test.cpp b/src/beast/beast/utility/tests/Zero.test.cpp index d40282d7b6..64cd0c41fe 100644 --- a/src/beast/beast/utility/tests/Zero.test.cpp +++ b/src/beast/beast/utility/tests/Zero.test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../Zero.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/utility/tests/bassert.test.cpp b/src/beast/beast/utility/tests/bassert.test.cpp index 2da5c702aa..ef67667a07 100644 --- a/src/beast/beast/utility/tests/bassert.test.cpp +++ b/src/beast/beast/utility/tests/bassert.test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../Config.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/utility/tests/empty_base_optimization.test.cpp b/src/beast/beast/utility/tests/empty_base_optimization.test.cpp index 1a72c2aed0..10808df5ae 100644 --- a/src/beast/beast/utility/tests/empty_base_optimization.test.cpp +++ b/src/beast/beast/utility/tests/empty_base_optimization.test.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif -#include "../empty_base_optimization.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/beast/utility/tests/tagged_integer.test.cpp b/src/beast/beast/utility/tests/tagged_integer.test.cpp index 4e0a383f62..a8b7e61197 100644 --- a/src/beast/beast/utility/tests/tagged_integer.test.cpp +++ b/src/beast/beast/utility/tests/tagged_integer.test.cpp @@ -18,13 +18,13 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../../BeastConfig.h" +#include #endif #include -#include "../tagged_integer.h" -#include "../../unit_test/suite.h" +#include +#include namespace beast { diff --git a/src/beast/beast/utility/type_name.h b/src/beast/beast/utility/type_name.h index 3e02fdfe82..fadf8d9076 100644 --- a/src/beast/beast/utility/type_name.h +++ b/src/beast/beast/utility/type_name.h @@ -24,7 +24,7 @@ #include #include #ifndef _MSC_VER -# include +#include #endif #include #include diff --git a/src/beast/modules/beast_asio/basics/FixedInputBuffer.h b/src/beast/modules/beast_asio/basics/FixedInputBuffer.h index 44da38a545..c260dc0ed0 100644 --- a/src/beast/modules/beast_asio/basics/FixedInputBuffer.h +++ b/src/beast/modules/beast_asio/basics/FixedInputBuffer.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED #define BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED -#include "../../../beast/asio/buffer_sequence.h" +#include #include namespace beast { diff --git a/src/beast/modules/beast_asio/beast_asio.h b/src/beast/modules/beast_asio/beast_asio.h index 80429b5dd4..3d8e2cd201 100644 --- a/src/beast/modules/beast_asio/beast_asio.h +++ b/src/beast/modules/beast_asio/beast_asio.h @@ -21,57 +21,57 @@ #define BEAST_ASIO_MODULE_H_INCLUDED // Must come before boost includes to fix the bost placeholders. -#include "../beast_core/beast_core.h" +#include // This module requires boost and possibly OpenSSL -#include "system/BoostIncludes.h" +#include -#include "../../beast/http/URL.h" -#include "../../beast/http/ParsedURL.h" +#include +#include -#include "../../beast/asio/IPAddressConversion.h" +#include // Order matters -#include "async/AsyncObject.h" +#include -#include "basics/FixedInputBuffer.h" -#include "basics/PeerRole.h" -#include "basics/SSLContext.h" -#include "basics/SharedArg.h" +#include +#include +#include +#include -# include "http/HTTPVersion.h" -# include "http/HTTPField.h" -# include "http/HTTPHeaders.h" -# include "http/HTTPMessage.h" -# include "http/HTTPRequest.h" -# include "http/HTTPResponse.h" +#include +#include +#include +#include +#include +#include -# include "http/HTTPParser.h" -#include "http/HTTPRequestParser.h" -#include "http/HTTPResponseParser.h" +#include +#include +#include -#include "http/HTTPClientType.h" +#include -# include "protocol/InputParser.h" -# include "protocol/HandshakeDetectLogic.h" -#include "protocol/HandshakeDetectLogicPROXY.h" -#include "protocol/HandshakeDetectLogicSSL2.h" -#include "protocol/HandshakeDetectLogicSSL3.h" -#include "protocol/HandshakeDetector.h" -#include "protocol/PrefilledReadStream.h" +#include +#include +#include +#include +#include +#include +#include -#include "tests/TestPeerBasics.h" -#include "tests/TestPeer.h" -#include "tests/TestPeerDetails.h" -#include "tests/TestPeerLogic.h" -#include "tests/TestPeerLogicSyncServer.h" -#include "tests/TestPeerLogicSyncClient.h" -#include "tests/TestPeerLogicProxyClient.h" -#include "tests/TestPeerLogicAsyncServer.h" -#include "tests/TestPeerLogicAsyncClient.h" -#include "tests/TestPeerType.h" -#include "tests/TestPeerDetailsTcp.h" -#include "tests/PeerTest.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/beast/modules/beast_asio/beast_asio.unity.cpp b/src/beast/modules/beast_asio/beast_asio.unity.cpp index 6c95da660e..aa4fc5562e 100644 --- a/src/beast/modules/beast_asio/beast_asio.unity.cpp +++ b/src/beast/modules/beast_asio/beast_asio.unity.cpp @@ -18,39 +18,39 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "system/OpenSSLIncludes.h" +#include -#include "beast_asio.h" +#include -# include "../../beast/http/impl/joyent_parser.h" +#include -#include "basics/PeerRole.cpp" -#include "basics/SSLContext.cpp" +#include +#include -#include "protocol/HandshakeDetectLogicPROXY.cpp" +#include -# include "http/HTTPParserImpl.h" -#include "http/HTTPClientType.cpp" -#include "http/HTTPField.cpp" -#include "http/HTTPHeaders.cpp" -#include "http/HTTPMessage.cpp" -#include "http/HTTPRequest.cpp" -#include "http/HTTPResponse.cpp" -#include "http/HTTPVersion.cpp" +#include +#include +#include +#include +#include +#include +#include +#include -#include "tests/PeerTest.cpp" -#include "tests/TestPeerBasics.cpp" -#include "tests/TestPeerLogic.cpp" -#include "tests/TestPeerLogicProxyClient.cpp" -#include "tests/TestPeerLogicSyncServer.cpp" -#include "tests/TestPeerLogicSyncClient.cpp" -#include "tests/TestPeerLogicAsyncServer.cpp" -#include "tests/TestPeerLogicAsyncClient.cpp" -#include "tests/TestPeerUnitTests.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "http/HTTPParser.cpp" -#include "http/HTTPRequestParser.cpp" -#include "http/HTTPResponseParser.cpp" +#include +#include +#include diff --git a/src/beast/modules/beast_asio/http/HTTPClientType.cpp b/src/beast/modules/beast_asio/http/HTTPClientType.cpp index 8dc68feecc..2527d372ef 100644 --- a/src/beast/modules/beast_asio/http/HTTPClientType.cpp +++ b/src/beast/modules/beast_asio/http/HTTPClientType.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../../beast/asio/wrap_handler.h" -#include "../../../beast/asio/placeholders.h" -#include "../../../beast/unit_test/suite.h" +#include +#include +#include -#include "../../../beast/cxx14/memory.h" // +#include // namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/http/HTTPClientType.h b/src/beast/modules/beast_asio/http/HTTPClientType.h index d256afe382..aac69eff79 100644 --- a/src/beast/modules/beast_asio/http/HTTPClientType.h +++ b/src/beast/modules/beast_asio/http/HTTPClientType.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED #define BEAST_ASIO_HTTPCLIENTTYPE_H_INCLUDED -#include "../../../beast/asio/shared_handler.h" +#include #include diff --git a/src/beast/modules/beast_asio/http/HTTPField.h b/src/beast/modules/beast_asio/http/HTTPField.h index 9671de6a4c..257b65c7e3 100644 --- a/src/beast/modules/beast_asio/http/HTTPField.h +++ b/src/beast/modules/beast_asio/http/HTTPField.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED #define BEAST_ASIO_HTTPFIELD_H_INCLUDED -#include "../../../beast/strings/String.h" +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPHeaders.h b/src/beast/modules/beast_asio/http/HTTPHeaders.h index e3360327b3..8b5d74aacd 100644 --- a/src/beast/modules/beast_asio/http/HTTPHeaders.h +++ b/src/beast/modules/beast_asio/http/HTTPHeaders.h @@ -20,9 +20,9 @@ #ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED #define BEAST_ASIO_HTTPHEADERS_H_INCLUDED -#include "HTTPField.h" +#include -#include "../../beast_core/text/StringPairArray.h" +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPMessage.h b/src/beast/modules/beast_asio/http/HTTPMessage.h index 588b830ce7..bafdb63049 100644 --- a/src/beast/modules/beast_asio/http/HTTPMessage.h +++ b/src/beast/modules/beast_asio/http/HTTPMessage.h @@ -20,12 +20,12 @@ #ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED #define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED -#include "HTTPHeaders.h" -#include "HTTPVersion.h" +#include +#include -#include "../../../beast/smart_ptr/SharedObject.h" -#include "../../../beast/net/DynamicBuffer.h" -#include "../../beast_core/text/StringPairArray.h" +#include +#include +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPParser.h b/src/beast/modules/beast_asio/http/HTTPParser.h index 791f981bfc..9ef09177eb 100644 --- a/src/beast/modules/beast_asio/http/HTTPParser.h +++ b/src/beast/modules/beast_asio/http/HTTPParser.h @@ -20,8 +20,8 @@ #ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED #define BEAST_ASIO_HTTPPARSER_H_INCLUDED -#include "HTTPRequest.h" -#include "HTTPResponse.h" +#include +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPRequest.h b/src/beast/modules/beast_asio/http/HTTPRequest.h index ee3d9db93f..36b4dcc573 100644 --- a/src/beast/modules/beast_asio/http/HTTPRequest.h +++ b/src/beast/modules/beast_asio/http/HTTPRequest.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED #define BEAST_ASIO_HTTPREQUEST_H_INCLUDED -#include "HTTPMessage.h" +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPRequestParser.h b/src/beast/modules/beast_asio/http/HTTPRequestParser.h index 00cda4135f..ef370e3d23 100644 --- a/src/beast/modules/beast_asio/http/HTTPRequestParser.h +++ b/src/beast/modules/beast_asio/http/HTTPRequestParser.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_REQUESTPARSER_H_INCLUDED #define BEAST_HTTP_REQUESTPARSER_H_INCLUDED -#include "HTTPParser.h" +#include namespace beast { diff --git a/src/beast/modules/beast_asio/http/HTTPResponseParser.h b/src/beast/modules/beast_asio/http/HTTPResponseParser.h index 422c9f0b26..eee6d1d2bd 100644 --- a/src/beast/modules/beast_asio/http/HTTPResponseParser.h +++ b/src/beast/modules/beast_asio/http/HTTPResponseParser.h @@ -20,7 +20,7 @@ #ifndef BEAST_HTTP_RESPONSEPARSER_H_INCLUDED #define BEAST_HTTP_RESPONSEPARSER_H_INCLUDED -#include "HTTPParser.h" +#include namespace beast { diff --git a/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h b/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h index 329232e88c..1593b32869 100644 --- a/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h +++ b/src/beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h @@ -20,8 +20,8 @@ #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED -#include "HandshakeDetectLogic.h" -#include "InputParser.h" +#include +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/protocol/HandshakeDetector.h b/src/beast/modules/beast_asio/protocol/HandshakeDetector.h index 7b4be8461a..f4281a6641 100644 --- a/src/beast/modules/beast_asio/protocol/HandshakeDetector.h +++ b/src/beast/modules/beast_asio/protocol/HandshakeDetector.h @@ -20,11 +20,11 @@ #ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED #define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED -#include "../../../beast/boost/get_pointer.h" -#include "../../../beast/asio/bind_handler.h" -#include "../../../beast/asio/wrap_handler.h" -#include "../../../beast/asio/placeholders.h" -#include "../../../beast/asio/shared_handler.h" +#include +#include +#include +#include +#include #include diff --git a/src/beast/modules/beast_asio/protocol/InputParser.h b/src/beast/modules/beast_asio/protocol/InputParser.h index d6bb3e84e5..ae048ce385 100644 --- a/src/beast/modules/beast_asio/protocol/InputParser.h +++ b/src/beast/modules/beast_asio/protocol/InputParser.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED #define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED -#include "../basics/FixedInputBuffer.h" +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/protocol/PrefilledReadStream.h b/src/beast/modules/beast_asio/protocol/PrefilledReadStream.h index 4d488f3923..6bbb99d57c 100644 --- a/src/beast/modules/beast_asio/protocol/PrefilledReadStream.h +++ b/src/beast/modules/beast_asio/protocol/PrefilledReadStream.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED #define BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED -#include "../../../beast/cxx14/type_traits.h" // +#include // #include namespace beast { diff --git a/src/beast/modules/beast_asio/system/BoostIncludes.h b/src/beast/modules/beast_asio/system/BoostIncludes.h index 609041cb87..7284510127 100644 --- a/src/beast/modules/beast_asio/system/BoostIncludes.h +++ b/src/beast/modules/beast_asio/system/BoostIncludes.h @@ -55,6 +55,6 @@ #include // work-around for broken -#include "../../../beast/boost/get_pointer.h" +#include #endif diff --git a/src/beast/modules/beast_asio/tests/PeerTest.h b/src/beast/modules/beast_asio/tests/PeerTest.h index 6020db5d65..48345b14c3 100644 --- a/src/beast/modules/beast_asio/tests/PeerTest.h +++ b/src/beast/modules/beast_asio/tests/PeerTest.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED #define BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED -#include "../../../beast/unit_test/suite.h" +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/tests/TestPeerDetails.h b/src/beast/modules/beast_asio/tests/TestPeerDetails.h index 18d4bd1ab7..7a4a79fe2e 100644 --- a/src/beast/modules/beast_asio/tests/TestPeerDetails.h +++ b/src/beast/modules/beast_asio/tests/TestPeerDetails.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED #define BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED -#include "../../../beast/asio/abstract_socket.h" +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/tests/TestPeerDetailsTcp.h b/src/beast/modules/beast_asio/tests/TestPeerDetailsTcp.h index 2c4f576a19..b72b939159 100644 --- a/src/beast/modules/beast_asio/tests/TestPeerDetailsTcp.h +++ b/src/beast/modules/beast_asio/tests/TestPeerDetailsTcp.h @@ -20,7 +20,7 @@ #ifndef BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED #define BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED -#include "../../../beast/asio/socket_wrapper.h" +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_asio/tests/TestPeerUnitTests.cpp b/src/beast/modules/beast_asio/tests/TestPeerUnitTests.cpp index 22dfc77278..6c673efb3d 100644 --- a/src/beast/modules/beast_asio/tests/TestPeerUnitTests.cpp +++ b/src/beast/modules/beast_asio/tests/TestPeerUnitTests.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { namespace asio { diff --git a/src/beast/modules/beast_core/beast_core.h b/src/beast/modules/beast_core/beast_core.h index ea57ea6a61..d2db01f1bb 100644 --- a/src/beast/modules/beast_core/beast_core.h +++ b/src/beast/modules/beast_core/beast_core.h @@ -25,12 +25,12 @@ #define BEAST_CORE_H_INCLUDED // TargetPlatform.h should not use anything from BeastConfig.h -#include "../../beast/Config.h" -#include "../../beast/config/ContractChecks.h" +#include +#include -# include "system/BeforeBoost.h" -# include "system/BoostIncludes.h" -#include "system/FunctionalIncludes.h" +#include +#include +#include #if BEAST_MSVC # pragma warning (disable: 4251) // (DLL build warning, must be disabled before pushing the warning state) @@ -44,26 +44,26 @@ //------------------------------------------------------------------------------ // New header-only library modeled more closely according to boost -#include "../../beast/SmartPtr.h" -#include "../../beast/StaticAssert.h" -#include "../../beast/Uncopyable.h" -#include "../../beast/Atomic.h" -#include "../../beast/Arithmetic.h" -#include "../../beast/ByteOrder.h" -#include "../../beast/HeapBlock.h" -#include "../../beast/Memory.h" -#include "../../beast/Intrusive.h" -#include "../../beast/Strings.h" -#include "../../beast/Threads.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../../beast/utility/Debug.h" -#include "../../beast/utility/Error.h" -#include "../../beast/utility/Journal.h" -#include "../../beast/utility/LeakChecked.h" -#include "../../beast/utility/PropertyStream.h" -#include "../../beast/utility/StaticObject.h" +#include +#include +#include +#include +#include +#include -#include "system/StandardIncludes.h" +#include namespace beast { @@ -78,13 +78,13 @@ class FileOutputStream; // Order matters, since headers don't have their own #include lines. // Add new includes to the bottom. -#include "system/Functional.h" +#include -#include "time/AtExitHook.h" -#include "time/Time.h" -#include "threads/ScopedLock.h" -#include "threads/CriticalSection.h" -#include "containers/ElementComparator.h" +#include +#include +#include +#include +#include // If the MSVC debug heap headers were included, disable // the macros during the juce include since they conflict. @@ -116,7 +116,7 @@ class FileOutputStream; #undef _aligned_offset_recalloc #undef _aligned_msize #endif -#include "containers/ArrayAllocationBase.h" +#include #ifdef _CRTDBG_MAP_ALLOC #pragma pop_macro("_aligned_msize") #pragma pop_macro("_aligned_offset_recalloc") @@ -133,49 +133,49 @@ class FileOutputStream; #pragma pop_macro("calloc") #endif -#include "containers/Array.h" +#include -#include "misc/Result.h" -#include "text/StringArray.h" -#include "memory/MemoryBlock.h" -#include "files/File.h" +#include +#include +#include +#include -#include "thread/MutexTraits.h" -#include "diagnostic/FatalError.h" -#include "text/LexicalCast.h" -#include "maths/Math.h" -#include "logging/Logger.h" -#include "containers/LinkedListPointer.h" -#include "maths/Random.h" -#include "text/StringPairArray.h" -#include "containers/ScopedValueSetter.h" -#include "maths/Range.h" -#include "files/DirectoryIterator.h" -#include "streams/InputStream.h" -#include "files/FileInputStream.h" -#include "streams/InputSource.h" -#include "streams/FileInputSource.h" -#include "streams/OutputStream.h" -#include "files/FileOutputStream.h" -#include "files/FileSearchPath.h" -#include "files/RandomAccessFile.h" -#include "files/TemporaryFile.h" -#include "logging/Logger.h" -#include "memory/SharedSingleton.h" -#include "misc/WindowsRegistry.h" -#include "streams/MemoryOutputStream.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "system/SystemStats.h" -#include "diagnostic/SemanticVersion.h" -#include "threads/DynamicLibrary.h" -#include "threads/Process.h" -#include "diagnostic/UnitTestUtilities.h" +#include +#include +#include +#include +#include -#include "diagnostic/MeasureFunctionCallTime.h" +#include -#include "thread/DeadlineTimer.h" +#include -#include "thread/Workers.h" +#include #if BEAST_MSVC #pragma warning (pop) diff --git a/src/beast/modules/beast_core/beast_core.unity.cpp b/src/beast/modules/beast_core/beast_core.unity.cpp index 6c2c4cb7ef..f2741a5ed9 100644 --- a/src/beast/modules/beast_core/beast_core.unity.cpp +++ b/src/beast/modules/beast_core/beast_core.unity.cpp @@ -22,12 +22,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif //============================================================================== -#include "native/BasicNativeHeaders.h" -#include "beast_core.h" +#include +#include #include #include @@ -126,45 +126,45 @@ #undef _aligned_msize #endif -#include "diagnostic/FatalError.cpp" -#include "diagnostic/SemanticVersion.cpp" -#include "diagnostic/UnitTestUtilities.cpp" +#include +#include +#include -#include "files/DirectoryIterator.cpp" -#include "files/File.cpp" -#include "files/FileInputStream.cpp" -#include "files/FileOutputStream.cpp" -#include "files/FileSearchPath.cpp" -#include "files/RandomAccessFile.cpp" -#include "files/TemporaryFile.cpp" +#include +#include +#include +#include +#include +#include +#include -#include "logging/Logger.cpp" +#include -#include "maths/Random.cpp" +#include -#include "memory/MemoryBlock.cpp" +#include -#include "misc/Result.cpp" +#include -#include "streams/FileInputSource.cpp" -#include "streams/InputStream.cpp" -#include "streams/MemoryOutputStream.cpp" -#include "streams/OutputStream.cpp" +#include +#include +#include +#include -#include "system/SystemStats.cpp" +#include -#include "text/LexicalCast.cpp" -#include "text/StringArray.cpp" -#include "text/StringPairArray.cpp" +#include +#include +#include -#include "thread/DeadlineTimer.cpp" -#include "thread/Workers.cpp" +#include +#include -#include "time/AtExitHook.cpp" -#include "time/Time.cpp" +#include +#include #if BEAST_MAC || BEAST_IOS -#include "native/osx_ObjCHelpers.h" +#include #endif #if BEAST_ANDROID @@ -172,31 +172,31 @@ #endif #if ! BEAST_WINDOWS -#include "native/posix_SharedCode.h" +#include #endif #if BEAST_MAC || BEAST_IOS -#include "native/mac_Files.mm" -#include "native/mac_Strings.mm" -#include "native/mac_SystemStats.mm" -#include "native/mac_Threads.mm" +#include +#include +#include +#include #elif BEAST_WINDOWS -#include "native/win32_ComSmartPtr.h" -#include "native/win32_Files.cpp" -#include "native/win32_Registry.cpp" -#include "native/win32_SystemStats.cpp" -#include "native/win32_Threads.cpp" +#include +#include +#include +#include +#include #elif BEAST_LINUX -#include "native/linux_Files.cpp" -#include "native/linux_SystemStats.cpp" -#include "native/linux_Threads.cpp" +#include +#include +#include #elif BEAST_BSD -#include "native/bsd_Files.cpp" -#include "native/bsd_SystemStats.cpp" -#include "native/bsd_Threads.cpp" +#include +#include +#include #elif BEAST_ANDROID #include "native/android_Files.cpp" @@ -234,4 +234,4 @@ void beast_reportFatalError (char const* message, char const* fileName, int line #endif // Must be outside the namespace -#include "system/BoostPlaceholdersFix.cpp" +#include diff --git a/src/beast/modules/beast_core/containers/Array.h b/src/beast/modules/beast_core/containers/Array.h index fb66292f29..b458f5a431 100644 --- a/src/beast/modules/beast_core/containers/Array.h +++ b/src/beast/modules/beast_core/containers/Array.h @@ -24,9 +24,9 @@ #ifndef BEAST_ARRAY_H_INCLUDED #define BEAST_ARRAY_H_INCLUDED -#include "ArrayAllocationBase.h" -#include "ElementComparator.h" -#include "../threads/CriticalSection.h" +#include +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/containers/ArrayAllocationBase.h b/src/beast/modules/beast_core/containers/ArrayAllocationBase.h index 6fd4358aba..874d40402d 100644 --- a/src/beast/modules/beast_core/containers/ArrayAllocationBase.h +++ b/src/beast/modules/beast_core/containers/ArrayAllocationBase.h @@ -24,7 +24,7 @@ #ifndef BEAST_ARRAYALLOCATIONBASE_H_INCLUDED #define BEAST_ARRAYALLOCATIONBASE_H_INCLUDED -#include "../../../beast/HeapBlock.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/diagnostic/FatalError.cpp b/src/beast/modules/beast_core/diagnostic/FatalError.cpp index 6be4f2ce4b..539a454994 100644 --- a/src/beast/modules/beast_core/diagnostic/FatalError.cpp +++ b/src/beast/modules/beast_core/diagnostic/FatalError.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/diagnostic/SemanticVersion.cpp b/src/beast/modules/beast_core/diagnostic/SemanticVersion.cpp index 732b74c78a..92651d74f9 100644 --- a/src/beast/modules/beast_core/diagnostic/SemanticVersion.cpp +++ b/src/beast/modules/beast_core/diagnostic/SemanticVersion.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/files/File.cpp b/src/beast/modules/beast_core/files/File.cpp index a8312b735b..f613ba009c 100644 --- a/src/beast/modules/beast_core/files/File.cpp +++ b/src/beast/modules/beast_core/files/File.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/files/File.h b/src/beast/modules/beast_core/files/File.h index 01832eb9f2..03891714e8 100644 --- a/src/beast/modules/beast_core/files/File.h +++ b/src/beast/modules/beast_core/files/File.h @@ -24,12 +24,12 @@ #ifndef BEAST_FILE_H_INCLUDED #define BEAST_FILE_H_INCLUDED -#include "../containers/Array.h" -#include "../memory/MemoryBlock.h" -#include "../misc/Result.h" -#include "../time/Time.h" -#include "../text/StringArray.h" -#include "../threads/CriticalSection.h" +#include +#include +#include +#include +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/files/RandomAccessFile.cpp b/src/beast/modules/beast_core/files/RandomAccessFile.cpp index 73a2e3527f..4d610ed1c6 100644 --- a/src/beast/modules/beast_core/files/RandomAccessFile.cpp +++ b/src/beast/modules/beast_core/files/RandomAccessFile.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/maths/Random.cpp b/src/beast/modules/beast_core/maths/Random.cpp index 496c8fc957..86e23b1ebb 100644 --- a/src/beast/modules/beast_core/maths/Random.cpp +++ b/src/beast/modules/beast_core/maths/Random.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/memory/MemoryBlock.h b/src/beast/modules/beast_core/memory/MemoryBlock.h index 7e365dfd58..4364e2213a 100644 --- a/src/beast/modules/beast_core/memory/MemoryBlock.h +++ b/src/beast/modules/beast_core/memory/MemoryBlock.h @@ -24,7 +24,7 @@ #ifndef BEAST_MEMORYBLOCK_H_INCLUDED #define BEAST_MEMORYBLOCK_H_INCLUDED -#include "../../../beast/utility/LeakChecked.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/memory/SharedSingleton.h b/src/beast/modules/beast_core/memory/SharedSingleton.h index fca8841ed8..200b9a9958 100644 --- a/src/beast/modules/beast_core/memory/SharedSingleton.h +++ b/src/beast/modules/beast_core/memory/SharedSingleton.h @@ -20,9 +20,9 @@ #ifndef BEAST_SHAREDSINGLETON_H_INCLUDED #define BEAST_SHAREDSINGLETON_H_INCLUDED -#include "../../../beast/threads/SpinLock.h" -#include "../../../beast/smart_ptr/SharedPtr.h" -#include "../time/AtExitHook.h" +#include +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/native/BasicNativeHeaders.h b/src/beast/modules/beast_core/native/BasicNativeHeaders.h index e20e4fd0bc..b3f42dcba0 100644 --- a/src/beast/modules/beast_core/native/BasicNativeHeaders.h +++ b/src/beast/modules/beast_core/native/BasicNativeHeaders.h @@ -24,7 +24,7 @@ #ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED #define BEAST_BASICNATIVEHEADERS_H_INCLUDED -#include "../../../beast/Config.h" +#include #undef T diff --git a/src/beast/modules/beast_core/system/BeforeBoost.h b/src/beast/modules/beast_core/system/BeforeBoost.h index ce9c2bc5e3..fc7a8626b0 100644 --- a/src/beast/modules/beast_core/system/BeforeBoost.h +++ b/src/beast/modules/beast_core/system/BeforeBoost.h @@ -21,12 +21,12 @@ #define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED // TargetPlatform.h should not use anything from BeastConfig.h -#include "../../../beast/Config.h" +#include // This file should be included before including any boost headers. // If you don't include this file, and you include boost headers, // Beast will generate a compile error with an explanation of why. -#include "BoostPlaceholdersFix.h" +#include #endif diff --git a/src/beast/modules/beast_core/system/FunctionalIncludes.h b/src/beast/modules/beast_core/system/FunctionalIncludes.h index b7d4b370ba..bc042832eb 100644 --- a/src/beast/modules/beast_core/system/FunctionalIncludes.h +++ b/src/beast/modules/beast_core/system/FunctionalIncludes.h @@ -28,7 +28,7 @@ # elif BEAST_MSVC # define BEAST_FUNCTIONAL_USES_STD 1 # elif BEAST_IOS || BEAST_MAC -# include // detect version of std::lib +#include // detect version of std::lib # if BEAST_IOS && BEAST_USE_BOOST_FEATURES // Work-around for iOS bugs with bind. # define BEAST_FUNCTIONAL_USES_BOOST 1 # elif _LIBCPP_VERSION // libc++ @@ -44,9 +44,9 @@ #endif #if BEAST_FUNCTIONAL_USES_STD -# include +#include #elif BEAST_FUNCTIONAL_USES_TR1 -# include +#include #elif BEAST_FUNCTIONAL_USES_BOOST // included in BoostPlaceholdersFix.h #endif diff --git a/src/beast/modules/beast_core/text/LexicalCast.cpp b/src/beast/modules/beast_core/text/LexicalCast.cpp index 09005298f9..a72b096172 100644 --- a/src/beast/modules/beast_core/text/LexicalCast.cpp +++ b/src/beast/modules/beast_core/text/LexicalCast.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/text/LexicalCast.h b/src/beast/modules/beast_core/text/LexicalCast.h index 9315816cee..ebaf52275a 100644 --- a/src/beast/modules/beast_core/text/LexicalCast.h +++ b/src/beast/modules/beast_core/text/LexicalCast.h @@ -21,7 +21,7 @@ #define BEAST_LEXICALCAST_H_INCLUDED #include -#include "../../../beast/cxx14/type_traits.h" // +#include // #include #include diff --git a/src/beast/modules/beast_core/text/StringArray.h b/src/beast/modules/beast_core/text/StringArray.h index 1957fe9b47..526bcdcea1 100644 --- a/src/beast/modules/beast_core/text/StringArray.h +++ b/src/beast/modules/beast_core/text/StringArray.h @@ -24,8 +24,8 @@ #ifndef BEAST_STRINGARRAY_H_INCLUDED #define BEAST_STRINGARRAY_H_INCLUDED -#include "../containers/Array.h" -#include "../threads/CriticalSection.h" +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/text/StringPairArray.h b/src/beast/modules/beast_core/text/StringPairArray.h index e9edce21ee..dd2f4b5707 100644 --- a/src/beast/modules/beast_core/text/StringPairArray.h +++ b/src/beast/modules/beast_core/text/StringPairArray.h @@ -24,8 +24,8 @@ #ifndef BEAST_STRINGPAIRARRAY_H_INCLUDED #define BEAST_STRINGPAIRARRAY_H_INCLUDED -#include "StringArray.h" -#include "../../../beast/utility/LeakChecked.h" +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/thread/Workers.cpp b/src/beast/modules/beast_core/thread/Workers.cpp index 2c72f9becb..b59b36a67f 100644 --- a/src/beast/modules/beast_core/thread/Workers.cpp +++ b/src/beast/modules/beast_core/thread/Workers.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/thread/Workers.h b/src/beast/modules/beast_core/thread/Workers.h index f20bc35825..4e92138c0e 100644 --- a/src/beast/modules/beast_core/thread/Workers.h +++ b/src/beast/modules/beast_core/thread/Workers.h @@ -20,8 +20,8 @@ #ifndef BEAST_WORKERS_H_INCLUDED #define BEAST_WORKERS_H_INCLUDED -#include "../system/SystemStats.h" -#include "../../../beast/threads/semaphore.h" +#include +#include namespace beast { diff --git a/src/beast/modules/beast_core/thread/detail/ScopedLock.h b/src/beast/modules/beast_core/thread/detail/ScopedLock.h index f4a72d3549..49289a27a5 100644 --- a/src/beast/modules/beast_core/thread/detail/ScopedLock.h +++ b/src/beast/modules/beast_core/thread/detail/ScopedLock.h @@ -20,7 +20,7 @@ #ifndef BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED #define BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED -#include "../MutexTraits.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/threads/CriticalSection.h b/src/beast/modules/beast_core/threads/CriticalSection.h index 1192764c8f..071b8922e4 100644 --- a/src/beast/modules/beast_core/threads/CriticalSection.h +++ b/src/beast/modules/beast_core/threads/CriticalSection.h @@ -24,7 +24,7 @@ #ifndef BEAST_CRITICALSECTION_H_INCLUDED #define BEAST_CRITICALSECTION_H_INCLUDED -#include "ScopedLock.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/time/AtExitHook.h b/src/beast/modules/beast_core/time/AtExitHook.h index 42ddbc55ed..91fdf85e89 100644 --- a/src/beast/modules/beast_core/time/AtExitHook.h +++ b/src/beast/modules/beast_core/time/AtExitHook.h @@ -20,7 +20,7 @@ #ifndef BEAST_CORE_ATEXITHOOK_H_INCLUDED #define BEAST_CORE_ATEXITHOOK_H_INCLUDED -#include "../../../beast/intrusive/List.h" +#include namespace beast { diff --git a/src/beast/modules/beast_core/time/Time.h b/src/beast/modules/beast_core/time/Time.h index d3c12b328b..f8294a1fd9 100644 --- a/src/beast/modules/beast_core/time/Time.h +++ b/src/beast/modules/beast_core/time/Time.h @@ -24,7 +24,7 @@ #ifndef BEAST_TIME_H_INCLUDED #define BEAST_TIME_H_INCLUDED -#include "../../../beast/chrono/RelativeTime.h" +#include namespace beast { diff --git a/src/beast/modules/beast_sqdb/api/session.h b/src/beast/modules/beast_sqdb/api/session.h index 56d04978ef..17b1dc7150 100644 --- a/src/beast/modules/beast_sqdb/api/session.h +++ b/src/beast/modules/beast_sqdb/api/session.h @@ -60,8 +60,8 @@ #ifndef BEAST_SQDB_SESSION_H_INCLUDED #define BEAST_SQDB_SESSION_H_INCLUDED -#include "../../../beast/smart_ptr/SharedPtr.h" -#include "../../beast_core/memory/SharedSingleton.h" +#include +#include namespace beast { namespace sqdb { diff --git a/src/beast/modules/beast_sqdb/api/transaction.h b/src/beast/modules/beast_sqdb/api/transaction.h index 4fa050f612..d9f1bed508 100644 --- a/src/beast/modules/beast_sqdb/api/transaction.h +++ b/src/beast/modules/beast_sqdb/api/transaction.h @@ -60,7 +60,7 @@ #ifndef BEAST_SQDB_TRANSACTION_H_INCLUDED #define BEAST_SQDB_TRANSACTION_H_INCLUDED -#include "../../../beast/utility/Error.h" +#include namespace beast { namespace sqdb { diff --git a/src/beast/modules/beast_sqdb/api/type_conversion_traits.h b/src/beast/modules/beast_sqdb/api/type_conversion_traits.h index 9625bd05a8..e49e9fabe6 100644 --- a/src/beast/modules/beast_sqdb/api/type_conversion_traits.h +++ b/src/beast/modules/beast_sqdb/api/type_conversion_traits.h @@ -60,7 +60,7 @@ #ifndef BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED #define BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED -#include "../../beast_core/time/Time.h" +#include #include diff --git a/src/beast/modules/beast_sqdb/beast_sqdb.h b/src/beast/modules/beast_sqdb/beast_sqdb.h index 7e826fcba5..2a547cf7e6 100644 --- a/src/beast/modules/beast_sqdb/beast_sqdb.h +++ b/src/beast/modules/beast_sqdb/beast_sqdb.h @@ -91,32 +91,32 @@ class session; // statement.h #pragma warning (disable: 4355) // 'this' : used in base member initializer list #endif -#include "api/backend.h" -#include "api/transaction.h" -#include "detail/type_ptr.h" +#include +#include +#include -#include "api/blob.h" -#include "api/type_conversion_traits.h" +#include +#include -#include "detail/exchange_traits.h" +#include -#include "detail/into_type.h" -#include "detail/use_type.h" +#include +#include -#include "api/statement.h" -#include "detail/type_conversion.h" +#include +#include -#include "detail/ref_counted_statement.h" +#include -#include "api/into.h" -#include "api/use.h" -#include "detail/ref_counted_prepare_info.h" +#include +#include +#include -#include "detail/prepare_temp_type.h" +#include -#include "detail/once_temp_type.h" +#include -#include "api/session.h" +#include #if _MSC_VER #pragma warning (pop) diff --git a/src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp b/src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp index fe27792cc9..fcb003b699 100644 --- a/src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp +++ b/src/beast/modules/beast_sqdb/beast_sqdb.unity.cpp @@ -18,12 +18,12 @@ //============================================================================== #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif -#include "beast_sqdb.h" +#include -#include "../beast_sqlite/beast_sqlite.h" +#include #if BEAST_MSVC #pragma warning (push) @@ -32,21 +32,21 @@ #endif // implementation headers -#include "detail/error_codes.h" -#include "detail/statement_imp.h" +#include +#include -#include "source/blob.cpp" -#include "source/error_codes.cpp" -#include "source/into_type.cpp" -#include "source/once_temp_type.cpp" -#include "source/prepare_temp_type.cpp" -#include "source/ref_counted_prepare_info.cpp" -#include "source/ref_counted_statement.cpp" -#include "source/session.cpp" -#include "source/statement.cpp" -#include "source/statement_imp.cpp" -#include "source/transaction.cpp" -#include "source/use_type.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if BEAST_MSVC #pragma warning (pop) diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.h b/src/beast/modules/beast_sqlite/beast_sqlite.h index 0f4d678d2c..8049106508 100644 --- a/src/beast/modules/beast_sqlite/beast_sqlite.h +++ b/src/beast/modules/beast_sqlite/beast_sqlite.h @@ -27,7 +27,7 @@ SQLite is public domain software, visit http://sqlite.org */ -#include "../../beast/config/PlatformConfig.h" +#include #if BEAST_IOS || BEAST_MAC # define BEAST_HAVE_NATIVE_SQLITE 1 @@ -37,9 +37,9 @@ #ifndef BEAST_SQLITE_CPP_INCLUDED # if BEAST_USE_NATIVE_SQLITE && BEAST_HAVE_NATIVE_SQLITE -# include +#include # else -# include "sqlite/sqlite3.h" // Amalgamated +#include // Amalgamated # endif #endif diff --git a/src/beast/modules/beast_sqlite/beast_sqlite.unity.c b/src/beast/modules/beast_sqlite/beast_sqlite.unity.c index 7e08b8f6c3..c5bf8b21a8 100644 --- a/src/beast/modules/beast_sqlite/beast_sqlite.unity.c +++ b/src/beast/modules/beast_sqlite/beast_sqlite.unity.c @@ -24,13 +24,13 @@ */ #if BEAST_INCLUDE_BEASTCONFIG -#include "../../BeastConfig.h" +#include #endif // Prevents sqlite.h from being included, since it screws up the .c #define BEAST_SQLITE_CPP_INCLUDED -#include "beast_sqlite.h" +#include #if ! (BEAST_USE_NATIVE_SQLITE && BEAST_HAVE_NATIVE_SQLITE) @@ -64,7 +64,7 @@ #define NDEBUG #endif -#include "sqlite/sqlite3.c" +#include #if BEAST_MSVC #pragma warning (pop) diff --git a/src/beast/modules/beast_sqlite/sqlite/sqlite3.c b/src/beast/modules/beast_sqlite/sqlite/sqlite3.c index 7c6d3e280d..850aba9278 100644 --- a/src/beast/modules/beast_sqlite/sqlite/sqlite3.c +++ b/src/beast/modules/beast_sqlite/sqlite/sqlite3.c @@ -90,9 +90,9 @@ ** disabled. */ #if defined(_HAVE_MINGW_H) -# include "mingw.h" +#include "mingw.h" #elif defined(_HAVE__MINGW_H) -# include "_mingw.h" +#include "_mingw.h" #endif /* @@ -8503,7 +8503,7 @@ SQLITE_PRIVATE const int sqlite3one; ** Default maximum size of memory used by memory-mapped I/O in the VFS */ #ifdef __APPLE__ -# include +#include # if TARGET_OS_IPHONE # undef SQLITE_MAX_MMAP_SIZE # define SQLITE_MAX_MMAP_SIZE 0 @@ -9886,7 +9886,7 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefault(void); #endif #if SQLITE_OS_WIN -# include +#include #endif /* @@ -12184,7 +12184,7 @@ SQLITE_PRIVATE int sqlite3CantopenError(int); */ #if !defined(SQLITE_ASCII) || \ (defined(SQLITE_ENABLE_FTS3) && defined(SQLITE_AMALGAMATION)) -# include +#include #endif /* @@ -16188,7 +16188,7 @@ static malloc_zone_t* _sqliteZone_; ** the macro SQLITE_MALLOCSIZE to the desired function name. */ #if defined(SQLITE_USE_MALLOC_H) -# include +#include # if defined(SQLITE_USE_MALLOC_USABLE_SIZE) # if !defined(SQLITE_MALLOCSIZE) # define SQLITE_MALLOCSIZE(x) malloc_usable_size(x) @@ -21745,7 +21745,7 @@ SQLITE_PRIVATE void sqlite3UtfSelfTest(void){ */ /* #include */ #ifdef SQLITE_HAVE_ISNAN -# include +#include #endif /* @@ -23580,22 +23580,22 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ #if SQLITE_ENABLE_LOCKING_STYLE -# include +#include # if OS_VXWORKS -# include -# include +#include +#include # else -# include -# include +#include +#include # endif #endif /* SQLITE_ENABLE_LOCKING_STYLE */ #if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) -# include +#include #endif #ifdef HAVE_UTIME -# include +#include #endif /* @@ -23608,7 +23608,7 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ ** the SQLITE_UNIX_THREADS macro. */ #if SQLITE_THREADSAFE -/* # include */ +/* #include */ # define SQLITE_UNIX_THREADS 1 #endif @@ -31159,8 +31159,8 @@ SQLITE_API int sqlite3_os_end(void){ #if SQLITE_OS_WIN /* This file is used for Windows only */ #ifdef __CYGWIN__ -# include -# include /* amalgamator: keep */ +#include +#include /* amalgamator: keep */ #endif /* diff --git a/src/beast/site_scons/site_tools/VSProject.py b/src/beast/site_scons/site_tools/VSProject.py index 5cff70f8a3..9e27ed6e6b 100644 --- a/src/beast/site_scons/site_tools/VSProject.py +++ b/src/beast/site_scons/site_tools/VSProject.py @@ -588,12 +588,12 @@ class _ProjectGenerator(object): _walk(target, items) self.items = sorted(items.itervalues(), key=lambda x: x.path()) - def makeListTag(self, items, tag, prefix='', inherit=True): + def makeListTag(self, items, prefix, tag, attrs, inherit=True): '''Builds an XML tag string from a list of items. If items is empty, then the returned string is empty.''' if not items: return '' - s = '%(prefix)s<%(tag)s>' % locals() + s = '%(prefix)s<%(tag)s%(attrs)s>' % locals() s += ';'.join(items) if inherit: s += ';%%(%(tag)s)' % locals() @@ -607,6 +607,13 @@ class _ProjectGenerator(object): items.append(winpath(os.path.relpath(path, self.project_dir))) return items + def extraRelPaths(self, paths, base): + extras = [] + for path in paths: + if not path in base: + extras.append(path) + return self.relPaths(extras) + def writeHeader(self): global clSwitches @@ -655,7 +662,7 @@ class _ProjectGenerator(object): itemList(config.env['CPPDEFINES'], ';'))) props = '' props += self.makeListTag(self.relPaths(sorted(config.env['CPPPATH'])), - 'AdditionalIncludeDirectories', ' ', True) + ' ', 'AdditionalIncludeDirectories', '', True) f.write(props) f.write(CLSWITCHES.getXml(sorted(config.env['CCFLAGS']), ' ')) f.write(' \r\n') @@ -663,9 +670,9 @@ class _ProjectGenerator(object): f.write(' \r\n') props = '' props += self.makeListTag(sorted(config.env['LIBS']), - 'AdditionalDependencies', ' ', True) + ' ', 'AdditionalDependencies', '', True) props += self.makeListTag(self.relPaths(sorted(config.env['LIBPATH'])), - 'AdditionalLibraryDirectories', ' ', True) + ' ', 'AdditionalLibraryDirectories', '', True) f.write(props) f.write(LINKSWITCHES.getXml(sorted(config.env['LINKFLAGS']), ' ')) f.write(' \r\n') @@ -688,8 +695,12 @@ class _ProjectGenerator(object): for config, output in sorted(item.node.iteritems()): name = config.name env = output.get_build_env() - props += self.makeListTag(self.relPaths(sorted(env['CPPPATH'])), - 'AdditionalIncludeDirectories', ' ', True) + variant = config.variant + platform = config.platform + props += self.makeListTag(self.extraRelPaths(sorted(env['CPPPATH']), config.env['CPPPATH']), + ' ', 'AdditionalIncludeDirectories', + ''' Condition="'$(Configuration)|$(Platform)'=='%(variant)s|%(platform)s'"''' % locals(), + True) elif item.builder() == 'Protoc': for config, output in sorted(item.node.iteritems()): name = config.name diff --git a/src/ripple/beast/ripple_beast.unity.cpp b/src/ripple/beast/ripple_beast.unity.cpp index c9316602de..d320570f89 100644 --- a/src/ripple/beast/ripple_beast.unity.cpp +++ b/src/ripple/beast/ripple_beast.unity.cpp @@ -25,28 +25,28 @@ */ // MUST come first! -#include "../../BeastConfig.h" +#include // Include this to get all the basic includes included, to prevent errors -#include "../../beast/modules/beast_core/beast_core.unity.cpp" -#include "../../beast/modules/beast_asio/beast_asio.unity.cpp" -#include "../../beast/modules/beast_sqdb/beast_sqdb.unity.cpp" +#include +#include +#include -#include "../../beast/beast/asio/Asio.unity.cpp" -#include "../../beast/beast/boost/Boost.unity.cpp" -#include "../../beast/beast/chrono/Chrono.unity.cpp" -#include "../../beast/beast/container/Container.unity.cpp" -#include "../../beast/beast/crypto/Crypto.unity.cpp" -#include "../../beast/beast/http/HTTP.unity.cpp" -#include "../../beast/beast/insight/Insight.unity.cpp" -#include "../../beast/beast/net/Net.unity.cpp" -#include "../../beast/beast/streams/streams.unity.cpp" -#include "../../beast/beast/strings/Strings.unity.cpp" -#include "../../beast/beast/threads/Threads.unity.cpp" -#include "../../beast/beast/utility/Utility.unity.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../../beast/beast/cxx14/cxx14.unity.cpp" +#include -#include "../../beast/beast/unit_test/define_print.cpp" +#include #endif diff --git a/src/ripple/beast/ripple_beastc.unity.c b/src/ripple/beast/ripple_beastc.unity.c index cb91d13d1b..80971a5cf0 100644 --- a/src/ripple/beast/ripple_beastc.unity.c +++ b/src/ripple/beast/ripple_beastc.unity.c @@ -24,10 +24,10 @@ Note that these sources must be compiled using the C compiler. */ -#include "../../BeastConfig.h" +#include #ifdef __cplusplus #error "Whoops! This file must be compiled with a C compiler!" #endif -#include "../../beast/modules/beast_sqlite/beast_sqlite.unity.c" +#include diff --git a/src/ripple/common/KeyCache.h b/src/ripple/common/KeyCache.h index 6c010c965b..feea9bbf3d 100644 --- a/src/ripple/common/KeyCache.h +++ b/src/ripple/common/KeyCache.h @@ -25,11 +25,11 @@ #include -#include "../../beast/beast/chrono/abstract_clock.h" -#include "../../beast/beast/chrono/chrono_io.h" -#include "../../beast/beast/Insight.h" -#include "../../beast/beast/container/hardened_hash.h" -#include "UnorderedContainers.h" +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/common/MultiSocket.h b/src/ripple/common/MultiSocket.h index 00b492eac3..c812f9df65 100644 --- a/src/ripple/common/MultiSocket.h +++ b/src/ripple/common/MultiSocket.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_COMMON_MULTISOCKET_H_INCLUDED #define RIPPLE_COMMON_MULTISOCKET_H_INCLUDED -#include "../../beast/beast/asio/abstract_socket.h" -#include "../../beast/beast/net/IPEndpoint.h" -#include "../../beast/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h" +#include +#include +#include #include diff --git a/src/ripple/common/Resolver.h b/src/ripple/common/Resolver.h index 91eed2dd21..c0f96394b2 100644 --- a/src/ripple/common/Resolver.h +++ b/src/ripple/common/Resolver.h @@ -23,8 +23,8 @@ #include #include -#include "../../beast/beast/boost/ErrorCode.h" -#include "../../beast/beast/net/IPEndpoint.h" +#include +#include namespace ripple { diff --git a/src/ripple/common/ResolverAsio.h b/src/ripple/common/ResolverAsio.h index d46fd658d2..a2cf15d66a 100644 --- a/src/ripple/common/ResolverAsio.h +++ b/src/ripple/common/ResolverAsio.h @@ -22,8 +22,8 @@ #include -#include "../../beast/beast/utility/Journal.h" -#include "Resolver.h" +#include +#include namespace ripple { diff --git a/src/ripple/common/RippleSSLContext.h b/src/ripple/common/RippleSSLContext.h index 8160c4aa48..43de1e8ec4 100644 --- a/src/ripple/common/RippleSSLContext.h +++ b/src/ripple/common/RippleSSLContext.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED #define RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED -#include "../../beast/modules/beast_asio/basics/SSLContext.h" +#include #include diff --git a/src/ripple/common/TaggedCache.h b/src/ripple/common/TaggedCache.h index f554a1089c..8cdd7b1083 100644 --- a/src/ripple/common/TaggedCache.h +++ b/src/ripple/common/TaggedCache.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TAGGEDCACHE_H_INCLUDED #define RIPPLE_TAGGEDCACHE_H_INCLUDED -#include "../../beast/beast/chrono/abstract_clock.h" -#include "../../beast/beast/chrono/chrono_io.h" -#include "../../beast/beast/Insight.h" -#include "../../beast/beast/container/hardened_hash.h" +#include +#include +#include +#include #include diff --git a/src/ripple/common/UnorderedContainers.h b/src/ripple/common/UnorderedContainers.h index 52b3f4794a..3e2ba8af8f 100644 --- a/src/ripple/common/UnorderedContainers.h +++ b/src/ripple/common/UnorderedContainers.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_UNORDERED_CONTAINERS_H #define RIPPLE_UNORDERED_CONTAINERS_H -#include "../../beast/beast/container/hash_append.h" +#include #include #include diff --git a/src/ripple/common/byte_view.h b/src/ripple/common/byte_view.h index 0b97809131..7df7379fea 100644 --- a/src/ripple/common/byte_view.h +++ b/src/ripple/common/byte_view.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BYTE_VIEW_H_INCLUDED #define RIPPLE_BYTE_VIEW_H_INCLUDED -#include "../../beast/beast/container/buffer_view.h" +#include #include diff --git a/src/ripple/common/impl/KeyCache.cpp b/src/ripple/common/impl/KeyCache.cpp index eadadc0339..80a3794dd9 100644 --- a/src/ripple/common/impl/KeyCache.cpp +++ b/src/ripple/common/impl/KeyCache.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../KeyCache.h" +#include -#include "../../beast/beast/unit_test/suite.h" -#include "../../beast/beast/chrono/manual_clock.h" +#include +#include namespace ripple { diff --git a/src/ripple/common/impl/MultiSocket.cpp b/src/ripple/common/impl/MultiSocket.cpp index 00394376dc..29457ae555 100644 --- a/src/ripple/common/impl/MultiSocket.cpp +++ b/src/ripple/common/impl/MultiSocket.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "MultiSocketType.h" +#include -#include "../RippleSSLContext.h" +#include -#include "../../beast/beast/unit_test/suite.h" +#include #include diff --git a/src/ripple/common/impl/MultiSocketType.h b/src/ripple/common/impl/MultiSocketType.h index 86f5866298..65ea218b15 100644 --- a/src/ripple/common/impl/MultiSocketType.h +++ b/src/ripple/common/impl/MultiSocketType.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_COMMON_MULTISOCKETTYPE_H_INCLUDED #define RIPPLE_COMMON_MULTISOCKETTYPE_H_INCLUDED -#include "../MultiSocket.h" +#include -#include "../../../beast/beast/boost/get_pointer.h" -#include "../../../beast/beast/asio/wrap_handler.h" -#include "../../../beast/beast/asio/placeholders.h" +#include +#include +#include -#include "../../../beast/beast/cxx14/type_traits.h" +#include #include diff --git a/src/ripple/common/impl/ResolverAsio.cpp b/src/ripple/common/impl/ResolverAsio.cpp index c179c95528..0f31604f87 100644 --- a/src/ripple/common/impl/ResolverAsio.cpp +++ b/src/ripple/common/impl/ResolverAsio.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../beast/modules/beast_asio/beast_asio.h" -#include "../../beast/beast/asio/IPAddressConversion.h" +#include +#include #include #include @@ -26,7 +26,7 @@ #include "boost/asio.hpp" -#include "../ResolverAsio.h" +#include #include diff --git a/src/ripple/common/impl/RippleSSLContext.cpp b/src/ripple/common/impl/RippleSSLContext.cpp index fd290be1e8..754320b302 100644 --- a/src/ripple/common/impl/RippleSSLContext.cpp +++ b/src/ripple/common/impl/RippleSSLContext.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../RippleSSLContext.h" +#include #include #include diff --git a/src/ripple/common/impl/TaggedCache.cpp b/src/ripple/common/impl/TaggedCache.cpp index 74871139ed..6fccc5dc8d 100644 --- a/src/ripple/common/impl/TaggedCache.cpp +++ b/src/ripple/common/impl/TaggedCache.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../TaggedCache.h" +#include -#include "../../beast/beast/unit_test/suite.h" -#include "../../beast/beast/chrono/manual_clock.h" +#include +#include namespace ripple { diff --git a/src/ripple/common/jsonrpc_fields.h b/src/ripple/common/jsonrpc_fields.h index 3eb3660beb..567f3062ed 100644 --- a/src/ripple/common/jsonrpc_fields.h +++ b/src/ripple/common/jsonrpc_fields.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_COMMON_JSONRPC_FIELDS_H_INCLUDED #define RIPPLE_COMMON_JSONRPC_FIELDS_H_INCLUDED -#include "../json/ripple_json.h" +#include namespace ripple { namespace jss { diff --git a/src/ripple/common/ripple_common.unity.cpp b/src/ripple/common/ripple_common.unity.cpp index 632ffb9ed0..6c0d1e0a32 100644 --- a/src/ripple/common/ripple_common.unity.cpp +++ b/src/ripple/common/ripple_common.unity.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "impl/KeyCache.cpp" -#include "impl/TaggedCache.cpp" -#include "impl/ResolverAsio.cpp" -#include "impl/MultiSocket.cpp" -#include "impl/RippleSSLContext.cpp" +#include +#include +#include +#include +#include diff --git a/src/ripple/common/seconds_clock.h b/src/ripple/common/seconds_clock.h index d4f1deb000..dd55a93f86 100644 --- a/src/ripple/common/seconds_clock.h +++ b/src/ripple/common/seconds_clock.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SECONDS_CLOCK_H_INCLUDED #define RIPPLE_SECONDS_CLOCK_H_INCLUDED -#include "../../beast/beast/chrono/abstract_clock.h" -#include "../../beast/beast/chrono/basic_seconds_clock.h" +#include +#include #include diff --git a/src/ripple/common/tests/cross_offer.test.cpp b/src/ripple/common/tests/cross_offer.test.cpp index e922b07516..0720088ca0 100644 --- a/src/ripple/common/tests/cross_offer.test.cpp +++ b/src/ripple/common/tests/cross_offer.test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" +#include -#include "../../../beast/beast/utility/noexcept.h" +#include #include #include #include #include -#include "../../../beast/beast/cxx14/type_traits.h" // +#include // #include #include diff --git a/src/ripple/http/api/Port.h b/src/ripple/http/api/Port.h index d386d83eac..09b2d72209 100644 --- a/src/ripple/http/api/Port.h +++ b/src/ripple/http/api/Port.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_HTTP_PORT_H_INCLUDED #define RIPPLE_HTTP_PORT_H_INCLUDED -#include "../../beast/beast/net/IPEndpoint.h" -#include "../../beast/modules/beast_asio/basics/SSLContext.h" +#include +#include #include diff --git a/src/ripple/http/api/Session.h b/src/ripple/http/api/Session.h index 15cda5994f..493959e9ab 100644 --- a/src/ripple/http/api/Session.h +++ b/src/ripple/http/api/Session.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_HTTP_SESSION_H_INCLUDED #define RIPPLE_HTTP_SESSION_H_INCLUDED -#include "../../beast/beast/smart_ptr/SharedPtr.h" -#include "../../beast/beast/net/IPEndpoint.h" -#include "../../beast/beast/utility/Journal.h" -#include "../../beast/modules/beast_asio/http/HTTPRequest.h" +#include +#include +#include +#include #include diff --git a/src/ripple/http/impl/Peer.h b/src/ripple/http/impl/Peer.h index 65c87298f3..9ea109c8cd 100644 --- a/src/ripple/http/impl/Peer.h +++ b/src/ripple/http/impl/Peer.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_HTTP_PEER_H_INCLUDED #define RIPPLE_HTTP_PEER_H_INCLUDED -#include "../api/Session.h" -#include "../../ripple/common/MultiSocket.h" +#include +#include -#include "../../beast/modules/beast_asio/async/AsyncObject.h" -#include "../../beast/modules/beast_asio/basics/SharedArg.h" -#include "../../beast/modules/beast_asio/http/HTTPRequestParser.h" +#include +#include +#include #include diff --git a/src/ripple/http/impl/ServerImpl.h b/src/ripple/http/impl/ServerImpl.h index 1844c696dc..253ff404d5 100644 --- a/src/ripple/http/impl/ServerImpl.h +++ b/src/ripple/http/impl/ServerImpl.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_HTTP_SERVERIMPL_H_INCLUDED #define RIPPLE_HTTP_SERVERIMPL_H_INCLUDED -#include "../../beast/beast/threads/Thread.h" -#include "../../beast/modules/beast_asio/basics/SharedArg.h" +#include +#include namespace ripple { namespace HTTP { diff --git a/src/ripple/http/ripple_http.h b/src/ripple/http/ripple_http.h index d0d668d542..94d2151ec6 100644 --- a/src/ripple/http/ripple_http.h +++ b/src/ripple/http/ripple_http.h @@ -24,12 +24,12 @@ // VFALCO NOTE this sucks that we have to include asio in the header // just for HTTPMessage!! -#include "../../beast/modules/beast_asio/beast_asio.h" +#include -# include "api/Port.h" -# include "api/ScopedStream.h" -# include "api/Session.h" -# include "api/Handler.h" -#include "api/Server.h" +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/http/ripple_http.unity.cpp b/src/ripple/http/ripple_http.unity.cpp index 013226cd70..cf95962217 100644 --- a/src/ripple/http/ripple_http.unity.cpp +++ b/src/ripple/http/ripple_http.unity.cpp @@ -17,22 +17,22 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_http.h" +#include -#include "../../ripple_net/ripple_net.h" +#include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include -#include "impl/Port.cpp" -#include "impl/ScopedStream.cpp" +#include +#include -# include "impl/Types.h" -# include "impl/ServerImpl.h" -# include "impl/Peer.h" -# include "impl/Door.h" -#include "impl/ServerImpl.cpp" -#include "impl/Server.cpp" +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/json/api/JsonPropertyStream.h b/src/ripple/json/api/JsonPropertyStream.h index 6545725b27..372a1d1f9b 100644 --- a/src/ripple/json/api/JsonPropertyStream.h +++ b/src/ripple/json/api/JsonPropertyStream.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED #define RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED -#include "../../../beast/beast/utility/PropertyStream.h" +#include namespace ripple { diff --git a/src/ripple/json/impl/Tests.cpp b/src/ripple/json/impl/Tests.cpp index 23e2043b7e..69ab957cfe 100644 --- a/src/ripple/json/impl/Tests.cpp +++ b/src/ripple/json/impl/Tests.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" -#include "../../../beast/beast/utility/type_name.h" +#include +#include namespace ripple { diff --git a/src/ripple/json/impl/json_value.cpp b/src/ripple/json/impl/json_value.cpp index 32b3997aa1..a056dc5fb1 100644 --- a/src/ripple/json/impl/json_value.cpp +++ b/src/ripple/json/impl/json_value.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include namespace Json { @@ -122,11 +122,11 @@ static struct DummyValueAllocatorInitializer // ////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////// #ifdef JSON_VALUE_USE_INTERNAL_MAP -# include "json_internalarray.inl" -# include "json_internalmap.inl" +# include +# include #endif // JSON_VALUE_USE_INTERNAL_MAP -# include "json_valueiterator.inl" +# include // ////////////////////////////////////////////////////////////////// diff --git a/src/ripple/json/ripple_json.h b/src/ripple/json/ripple_json.h index e70685ec2c..b9aaf76907 100644 --- a/src/ripple/json/ripple_json.h +++ b/src/ripple/json/ripple_json.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_JSON_H_INCLUDED #define RIPPLE_JSON_H_INCLUDED -#include "../../beast/beast/Config.h" +#include -#include "../../beast/beast/strings/String.h" -#include "../../beast/beast/utility/PropertyStream.h" +#include +#include #include #include @@ -32,22 +32,22 @@ // For json/ // // VFALCO TODO Clean up these one-offs -#include "api/json_config.h" // Needed before these cpptl includes +#include // Needed before these cpptl includes #ifndef JSON_USE_CPPTL_SMALLMAP -# include +#include #else -# include +#include #endif #ifdef JSON_USE_CPPTL -# include +#include #endif -#include "api/json_forwards.h" -#include "api/json_features.h" -#include "api/json_value.h" -#include "api/json_reader.h" -#include "api/json_writer.h" +#include +#include +#include +#include +#include -#include "api/JsonPropertyStream.h" +#include #endif diff --git a/src/ripple/json/ripple_json.unity.cpp b/src/ripple/json/ripple_json.unity.cpp index 0fd6a8a2a8..bcc479ab60 100644 --- a/src/ripple/json/ripple_json.unity.cpp +++ b/src/ripple/json/ripple_json.unity.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include #include #include @@ -28,22 +28,22 @@ // For json/ // #ifdef JSON_USE_CPPTL -# include +#include #endif #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR -#include "impl/json_batchallocator.h" +#include #endif -#include "ripple_json.h" +#include #define JSON_ASSERT_UNREACHABLE assert( false ) #define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw #define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message ); -#include "impl/json_reader.cpp" -#include "impl/json_value.cpp" -#include "impl/json_writer.cpp" +#include +#include +#include -#include "impl/Tests.cpp" +#include -#include "impl/JsonPropertyStream.cpp" +#include diff --git a/src/ripple/peerfinder/api/Callback.h b/src/ripple/peerfinder/api/Callback.h index 28a196f89f..771b3dac2b 100644 --- a/src/ripple/peerfinder/api/Callback.h +++ b/src/ripple/peerfinder/api/Callback.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_CALLBACK_H_INCLUDED #define RIPPLE_PEERFINDER_CALLBACK_H_INCLUDED -#include "Types.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/api/Manager.h b/src/ripple/peerfinder/api/Manager.h index f3a850a7f3..9629a1b242 100644 --- a/src/ripple/peerfinder/api/Manager.h +++ b/src/ripple/peerfinder/api/Manager.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_PEERFINDER_MANAGER_H_INCLUDED #define RIPPLE_PEERFINDER_MANAGER_H_INCLUDED -#include "Config.h" -#include "Slot.h" -#include "Types.h" +#include +#include +#include -#include "../../sitefiles/api/Manager.h" +#include -#include "../../../beast/modules/beast_core/files/File.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/api/Slot.h b/src/ripple/peerfinder/api/Slot.h index 6dd9785fba..246a8db1c6 100644 --- a/src/ripple/peerfinder/api/Slot.h +++ b/src/ripple/peerfinder/api/Slot.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERFINDER_SLOT_H_INCLUDED #define RIPPLE_PEERFINDER_SLOT_H_INCLUDED -#include "../../types/api/RipplePublicKey.h" +#include -#include "../../../beast/beast/net/IPEndpoint.h" +#include #include diff --git a/src/ripple/peerfinder/api/Types.h b/src/ripple/peerfinder/api/Types.h index 278e8dfb49..9623c06b2d 100644 --- a/src/ripple/peerfinder/api/Types.h +++ b/src/ripple/peerfinder/api/Types.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERFINDER_TYPES_H_INCLUDED #define RIPPLE_PEERFINDER_TYPES_H_INCLUDED -#include "Endpoint.h" +#include -#include "../../../beast/beast/chrono/abstract_clock.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Bootcache.cpp b/src/ripple/peerfinder/impl/Bootcache.cpp index 0bf5d0ae55..526607cd83 100644 --- a/src/ripple/peerfinder/impl/Bootcache.cpp +++ b/src/ripple/peerfinder/impl/Bootcache.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "Bootcache.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Checker.cpp b/src/ripple/peerfinder/impl/Checker.cpp index 7325df7352..f407bff61c 100644 --- a/src/ripple/peerfinder/impl/Checker.cpp +++ b/src/ripple/peerfinder/impl/Checker.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../../beast/beast/asio/wrap_handler.h" -#include "../../../beast/beast/asio/placeholders.h" +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Checker.h b/src/ripple/peerfinder/impl/Checker.h index 6d0feff030..6b7d59728b 100644 --- a/src/ripple/peerfinder/impl/Checker.h +++ b/src/ripple/peerfinder/impl/Checker.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_CHECKER_H_INCLUDED #define RIPPLE_PEERFINDER_CHECKER_H_INCLUDED -#include "../../../beast/beast/asio/shared_handler.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/ConnectHandouts.cpp b/src/ripple/peerfinder/impl/ConnectHandouts.cpp index 472ca3150c..78f83c2565 100644 --- a/src/ripple/peerfinder/impl/ConnectHandouts.cpp +++ b/src/ripple/peerfinder/impl/ConnectHandouts.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "ConnectHandouts.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/ConnectHandouts.h b/src/ripple/peerfinder/impl/ConnectHandouts.h index 818749a240..642f14e7e8 100644 --- a/src/ripple/peerfinder/impl/ConnectHandouts.h +++ b/src/ripple/peerfinder/impl/ConnectHandouts.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERFINDER_CONNECTHANDOUTS_H_INCLUDED #define RIPPLE_PEERFINDER_CONNECTHANDOUTS_H_INCLUDED -#include "Tuning.h" +#include -#include "../../../beast/beast/container/aged_set.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Counts.h b/src/ripple/peerfinder/impl/Counts.h index eb8255ac4a..7917195d39 100644 --- a/src/ripple/peerfinder/impl/Counts.h +++ b/src/ripple/peerfinder/impl/Counts.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED -#include "../api/Slot.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Endpoint.cpp b/src/ripple/peerfinder/impl/Endpoint.cpp index bcd2062d05..7e2887bec9 100644 --- a/src/ripple/peerfinder/impl/Endpoint.cpp +++ b/src/ripple/peerfinder/impl/Endpoint.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../api/Endpoint.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Fixed.h b/src/ripple/peerfinder/impl/Fixed.h index 08514e89e7..4127554cd8 100644 --- a/src/ripple/peerfinder/impl/Fixed.h +++ b/src/ripple/peerfinder/impl/Fixed.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERFINDER_FIXED_H_INCLUDED #define RIPPLE_PEERFINDER_FIXED_H_INCLUDED -#include "Tuning.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Livecache.cpp b/src/ripple/peerfinder/impl/Livecache.cpp index 05d4384c06..e962693531 100644 --- a/src/ripple/peerfinder/impl/Livecache.cpp +++ b/src/ripple/peerfinder/impl/Livecache.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" -#include "../../../beast/beast/chrono/manual_clock.h" +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/ripple/peerfinder/impl/Livecache.h index 0da11384c5..8422e5d27f 100644 --- a/src/ripple/peerfinder/impl/Livecache.h +++ b/src/ripple/peerfinder/impl/Livecache.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED -#include "../../../beast/beast/container/aged_map.h" -#include "../../../beast/beast/utility/maybe_const.h" +#include +#include #include #include diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h index 57e4901de6..7e93d43060 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/ripple/peerfinder/impl/Logic.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED -#include "Fixed.h" -#include "SlotImp.h" +#include +#include -#include "handout.h" -#include "ConnectHandouts.h" -#include "RedirectHandouts.h" -#include "SlotHandouts.h" +#include +#include +#include +#include -#include "../../../beast/beast/container/aged_container_utility.h" +#include #include #include diff --git a/src/ripple/peerfinder/impl/RedirectHandouts.cpp b/src/ripple/peerfinder/impl/RedirectHandouts.cpp index ed23529e72..b163aaebef 100644 --- a/src/ripple/peerfinder/impl/RedirectHandouts.cpp +++ b/src/ripple/peerfinder/impl/RedirectHandouts.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "RedirectHandouts.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/RedirectHandouts.h b/src/ripple/peerfinder/impl/RedirectHandouts.h index c6ae51ca3a..be645469fd 100644 --- a/src/ripple/peerfinder/impl/RedirectHandouts.h +++ b/src/ripple/peerfinder/impl/RedirectHandouts.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PEERFINDER_REDIRECTHANDOUTS_H_INCLUDED #define RIPPLE_PEERFINDER_REDIRECTHANDOUTS_H_INCLUDED -#include "SlotImp.h" -#include "Tuning.h" +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotHandouts.cpp b/src/ripple/peerfinder/impl/SlotHandouts.cpp index c35e373ef9..754c800de8 100644 --- a/src/ripple/peerfinder/impl/SlotHandouts.cpp +++ b/src/ripple/peerfinder/impl/SlotHandouts.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "SlotHandouts.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotHandouts.h b/src/ripple/peerfinder/impl/SlotHandouts.h index 0f57fad9f9..45b140ccbb 100644 --- a/src/ripple/peerfinder/impl/SlotHandouts.h +++ b/src/ripple/peerfinder/impl/SlotHandouts.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PEERFINDER_SLOTHANDOUTS_H_INCLUDED #define RIPPLE_PEERFINDER_SLOTHANDOUTS_H_INCLUDED -#include "SlotImp.h" -#include "Tuning.h" +#include +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotImp.cpp b/src/ripple/peerfinder/impl/SlotImp.cpp index df5161ed06..ca10461e91 100644 --- a/src/ripple/peerfinder/impl/SlotImp.cpp +++ b/src/ripple/peerfinder/impl/SlotImp.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "SlotImp.h" +#include namespace ripple { namespace PeerFinder { diff --git a/src/ripple/peerfinder/impl/SlotImp.h b/src/ripple/peerfinder/impl/SlotImp.h index 940971c480..7eeb654c76 100644 --- a/src/ripple/peerfinder/impl/SlotImp.h +++ b/src/ripple/peerfinder/impl/SlotImp.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED -#include "../api/Slot.h" +#include -#include "../../../beast/beast/container/aged_unordered_map.h" -#include "../../../beast/beast/container/aged_container_utility.h" +#include +#include #include diff --git a/src/ripple/peerfinder/ripple_peerfinder.h b/src/ripple/peerfinder/ripple_peerfinder.h index b698a9b65b..33d371b9e7 100644 --- a/src/ripple/peerfinder/ripple_peerfinder.h +++ b/src/ripple/peerfinder/ripple_peerfinder.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_PEERFINDER_H_INCLUDED #define RIPPLE_PEERFINDER_H_INCLUDED -#include "../sitefiles/ripple_sitefiles.h" +#include -#include "../types/api/RipplePublicKey.h" +#include -#include "api/Slot.h" -# include "api/Endpoint.h" -# include "api/Types.h" -#include "api/Callback.h" -#include "api/Config.h" -#include "api/Manager.h" +#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/peerfinder/ripple_peerfinder.unity.cpp b/src/ripple/peerfinder/ripple_peerfinder.unity.cpp index e1e3da14cb..a7aea47153 100644 --- a/src/ripple/peerfinder/ripple_peerfinder.unity.cpp +++ b/src/ripple/peerfinder/ripple_peerfinder.unity.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_peerfinder.h" +#include -#include "../../ripple/algorithm/api/CycledSet.h" -#include "../../ripple/common/Resolver.h" +#include +#include #include #include @@ -31,18 +31,18 @@ #include #include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include -#include "../../beast/modules/beast_sqdb/beast_sqdb.h" -#include "../../beast/modules/beast_asio/beast_asio.h" +#include +#include -#include "../../beast/beast/boost/ErrorCode.h" -#include "../../beast/beast/chrono/chrono_io.h" +#include +#include -#include "impl/iosformat.h" // VFALCO NOTE move to beast +#include // VFALCO NOTE move to beast #ifndef NDEBUG # define consistency_check(cond) bassert(cond) @@ -50,38 +50,38 @@ # define consistency_check(cond) #endif -#include "impl/PrivateTypes.h" -#include "impl/Tuning.h" -#include "impl/Checker.h" -#include "impl/CheckerAdapter.h" -#include "impl/Livecache.h" -#include "impl/SlotImp.h" -#include "impl/Counts.h" -#include "impl/Source.h" -#include "impl/SourceStrings.h" -#include "impl/Store.h" -#include "impl/Bootcache.h" -#include "impl/StoreSqdb.h" -#include "impl/Reporting.h" -#include "impl/Logic.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "impl/Bootcache.cpp" -#include "impl/Checker.cpp" -#include "impl/Config.cpp" -#include "impl/ConnectHandouts.cpp" -#include "impl/Endpoint.cpp" -#include "impl/Livecache.cpp" -#include "impl/Manager.cpp" -#include "impl/RedirectHandouts.cpp" -#include "impl/SlotHandouts.cpp" -#include "impl/SlotImp.cpp" -#include "impl/SourceStrings.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "sim/GraphAlgorithms.h" -#include "sim/WrappedSink.h" -#include "sim/Predicates.h" -#include "sim/FunctionQueue.h" -#include "sim/Message.h" -#include "sim/NodeSnapshot.h" -#include "sim/Params.h" -#include "sim/Tests.cpp" +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/radmap/api/BasicFullBelowCache.h b/src/ripple/radmap/api/BasicFullBelowCache.h index fa3c68b22b..3bd881586a 100644 --- a/src/ripple/radmap/api/BasicFullBelowCache.h +++ b/src/ripple/radmap/api/BasicFullBelowCache.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED #define RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED -#include "../../beast/beast/insight/Collector.h" +#include -#include "../../common/KeyCache.h" +#include -#include "Tuning.h" +#include namespace ripple { namespace RadMap { diff --git a/src/ripple/radmap/ripple_radmap.h b/src/ripple/radmap/ripple_radmap.h index ac3f2365da..98cb397e5c 100644 --- a/src/ripple/radmap/ripple_radmap.h +++ b/src/ripple/radmap/ripple_radmap.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RADMAP_H_INCLUDED #define RIPPLE_RADMAP_H_INCLUDED -#include "api/BasicFullBelowCache.h" -#include "api/Tuning.h" +#include +#include #endif diff --git a/src/ripple/radmap/ripple_radmap.unity.cpp b/src/ripple/radmap/ripple_radmap.unity.cpp index a7c17d5e6d..0a76f040d9 100644 --- a/src/ripple/radmap/ripple_radmap.unity.cpp +++ b/src/ripple/radmap/ripple_radmap.unity.cpp @@ -17,6 +17,6 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "impl/BasicFullBelowCache.cpp" +#include diff --git a/src/ripple/resource/api/Consumer.h b/src/ripple/resource/api/Consumer.h index 4f827e476b..00ddcb5208 100644 --- a/src/ripple/resource/api/Consumer.h +++ b/src/ripple/resource/api/Consumer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_CONSUMER_H_INCLUDED #define RIPPLE_RESOURCE_CONSUMER_H_INCLUDED -#include "Disposition.h" +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/api/Gossip.h b/src/ripple/resource/api/Gossip.h index c6cf2b10c4..16fcbcbc3e 100644 --- a/src/ripple/resource/api/Gossip.h +++ b/src/ripple/resource/api/Gossip.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_GOSSIP_H_INCLUDED #define RIPPLE_RESOURCE_GOSSIP_H_INCLUDED -#include "../../../beast/beast/net/IPEndpoint.h" +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/api/Manager.h b/src/ripple/resource/api/Manager.h index f9aa4c4859..b30f84e08e 100644 --- a/src/ripple/resource/api/Manager.h +++ b/src/ripple/resource/api/Manager.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_RESOURCE_MANAGER_H_INCLUDED #define RIPPLE_RESOURCE_MANAGER_H_INCLUDED -#include "Consumer.h" -#include "Gossip.h" +#include +#include -#include "../../../beast/beast/insight/Collector.h" -#include "../../../beast/beast/net/IPEndpoint.h" -#include "../../../beast/beast/utility/Journal.h" +#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Logic.h b/src/ripple/resource/impl/Logic.h index 4b9cf41bec..340666f95f 100644 --- a/src/ripple/resource/impl/Logic.h +++ b/src/ripple/resource/impl/Logic.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_RESOURCE_LOGIC_H_INCLUDED #define RIPPLE_RESOURCE_LOGIC_H_INCLUDED -#include "../../common/UnorderedContainers.h" +#include -#include "../../../beast/beast/chrono/abstract_clock.h" +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Manager.cpp b/src/ripple/resource/impl/Manager.cpp index c3881c9092..71ec4b2a4d 100644 --- a/src/ripple/resource/impl/Manager.cpp +++ b/src/ripple/resource/impl/Manager.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/beast/threads/Thread.h" +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Tests.cpp b/src/ripple/resource/impl/Tests.cpp index f31355e013..de73bd2982 100644 --- a/src/ripple/resource/impl/Tests.cpp +++ b/src/ripple/resource/impl/Tests.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" -#include "../../../beast/beast/chrono/manual_clock.h" -#include "../../../beast/modules/beast_core/maths/Random.h" +#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/ripple_resource.h b/src/ripple/resource/ripple_resource.h index cce0666976..a2b1c322e3 100644 --- a/src/ripple/resource/ripple_resource.h +++ b/src/ripple/resource/ripple_resource.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_RESOURCE_H_INCLUDED #define RIPPLE_RESOURCE_H_INCLUDED -#include "../json/ripple_json.h" +#include -# include "api/Types.h" -# include "api/Disposition.h" -# include "api/Charge.h" -# include "api/LegacyFees.h" -# include "api/Fees.h" -# include "api/Consumer.h" -# include "api/Gossip.h" -#include "api/Manager.h" +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/resource/ripple_resource.unity.cpp b/src/ripple/resource/ripple_resource.unity.cpp index 2e122e2f60..5a995271b0 100644 --- a/src/ripple/resource/ripple_resource.unity.cpp +++ b/src/ripple/resource/ripple_resource.unity.cpp @@ -17,29 +17,29 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_resource.h" +#include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include -#include "../algorithm/api/DecayingSample.h" -#include "../common/seconds_clock.h" +#include +#include -#include "../../beast/beast/Insight.h" -#include "../../beast/beast/cxx14/memory.h" -#include "../../beast/beast/chrono/chrono_io.h" +#include +#include +#include -#include "impl/Fees.cpp" -# include "impl/Kind.h" -# include "impl/Key.h" -# include "impl/Tuning.h" -# include "impl/Entry.h" -# include "impl/Import.h" -#include "impl/Charge.cpp" -# include "impl/Logic.h" -#include "impl/Consumer.cpp" -#include "impl/LegacyFees.cpp" -#include "impl/Manager.cpp" -#include "impl/Tests.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/rocksdb/ripple_rocksdb.h b/src/ripple/rocksdb/ripple_rocksdb.h index de4b239284..e3943e6dc8 100644 --- a/src/ripple/rocksdb/ripple_rocksdb.h +++ b/src/ripple/rocksdb/ripple_rocksdb.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_ROCKSDB_H_INCLUDED #define RIPPLE_ROCKSDB_H_INCLUDED -#include "../../beast/beast/Config.h" +#include #ifndef RIPPLE_ROCKSDB_AVAILABLE # if BEAST_WIN32 @@ -36,29 +36,29 @@ #if RIPPLE_ROCKSDB_AVAILABLE #define SNAPPY -#include "rocksdb/include/rocksdb/arena.h" -#include "rocksdb/include/rocksdb/cache.h" -#include "rocksdb/include/rocksdb/compaction_filter.h" -#include "rocksdb/include/rocksdb/comparator.h" -#include "rocksdb/include/rocksdb/db.h" -#include "rocksdb/include/rocksdb/env.h" -#include "rocksdb/include/rocksdb/filter_policy.h" -#include "rocksdb/include/rocksdb/flush_block_policy.h" -#include "rocksdb/include/rocksdb/iterator.h" -#include "rocksdb/include/rocksdb/memtablerep.h" -#include "rocksdb/include/rocksdb/merge_operator.h" -#include "rocksdb/include/rocksdb/options.h" -#include "rocksdb/include/rocksdb/perf_context.h" -#include "rocksdb/include/rocksdb/slice.h" -#include "rocksdb/include/rocksdb/slice_transform.h" -#include "rocksdb/include/rocksdb/statistics.h" -#include "rocksdb/include/rocksdb/status.h" -#include "rocksdb/include/rocksdb/table.h" -#include "rocksdb/include/rocksdb/table_properties.h" -#include "rocksdb/include/rocksdb/transaction_log.h" -#include "rocksdb/include/rocksdb/types.h" -#include "rocksdb/include/rocksdb/universal_compaction.h" -#include "rocksdb/include/rocksdb/write_batch.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif #endif diff --git a/src/ripple/rocksdb/ripple_rocksdb.unity.cpp b/src/ripple/rocksdb/ripple_rocksdb.unity.cpp index 2fc94e45e7..14018770fe 100644 --- a/src/ripple/rocksdb/ripple_rocksdb.unity.cpp +++ b/src/ripple/rocksdb/ripple_rocksdb.unity.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_rocksdb.h" +#include #if RIPPLE_ROCKSDB_AVAILABLE @@ -48,68 +48,68 @@ #define NDEBUG #endif -#include "rocksdb/db/builder.cc" -#include "rocksdb/db/db_filesnapshot.cc" -#include "rocksdb/db/dbformat.cc" -#include "rocksdb/db/db_impl.cc" -#include "rocksdb/db/db_impl_readonly.cc" -#include "rocksdb/db/db_iter.cc" -#include "rocksdb/db/db_stats_logger.cc" -#include "rocksdb/db/filename.cc" -#include "rocksdb/db/log_reader.cc" -#include "rocksdb/db/log_writer.cc" -#include "rocksdb/db/memtable.cc" -#include "rocksdb/db/memtablelist.cc" -#include "rocksdb/db/merge_helper.cc" -#include "rocksdb/db/merge_operator.cc" -#include "rocksdb/db/repair.cc" -#include "rocksdb/db/table_cache.cc" -#include "rocksdb/db/table_properties_collector.cc" -#include "rocksdb/db/transaction_log_impl.cc" -#include "rocksdb/db/version_edit.cc" -#include "rocksdb/db/version_set.cc" -#include "rocksdb/db/version_set_reduce_num_levels.cc" -#include "rocksdb/db/write_batch.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "rocksdb/table/block_based_table_builder.cc" -#include "rocksdb/table/block_based_table_factory.cc" -#include "rocksdb/table/block_based_table_reader.cc" -#include "rocksdb/table/block_builder.cc" -#include "rocksdb/table/block.cc" -#include "rocksdb/table/filter_block.cc" -#include "rocksdb/table/flush_block_policy.cc" -#include "rocksdb/table/format.cc" -#include "rocksdb/table/iterator.cc" -#include "rocksdb/table/merger.cc" -#include "rocksdb/table/two_level_iterator.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "rocksdb/util/arena_impl.cc" -#include "rocksdb/util/auto_roll_logger.cc" -#include "rocksdb/util/blob_store.cc" -#include "rocksdb/util/bloom.cc" -#include "rocksdb/util/cache.cc" -#include "rocksdb/util/coding.cc" -#include "rocksdb/util/comparator.cc" -#include "rocksdb/util/crc32c.cc" -#include "rocksdb/util/env.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include //#include "rocksdb/util/env_hdfs.cc" -#include "rocksdb/util/env_posix.cc" -#include "rocksdb/util/filter_policy.cc" -#include "rocksdb/util/hash.cc" -#include "rocksdb/util/hash_skiplist_rep.cc" -#include "rocksdb/util/histogram.cc" -#include "rocksdb/util/logging.cc" -#include "rocksdb/util/murmurhash.cc" -#include "rocksdb/util/options.cc" -#include "rocksdb/util/perf_context.cc" -#include "rocksdb/util/skiplistrep.cc" -#include "rocksdb/util/slice.cc" -#include "rocksdb/util/statistics.cc" -#include "rocksdb/util/status.cc" -#include "rocksdb/util/string_util.cc" -#include "rocksdb/util/transformrep.cc" -#include "rocksdb/util/vectorrep.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "rocksdb/port/port_posix.cc" +#include #endif diff --git a/src/ripple/sitefiles/api/Listener.h b/src/ripple/sitefiles/api/Listener.h index a55281d2b8..056fd6b316 100644 --- a/src/ripple/sitefiles/api/Listener.h +++ b/src/ripple/sitefiles/api/Listener.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SITEFILES_LISTENER_H_INCLUDED #define RIPPLE_SITEFILES_LISTENER_H_INCLUDED -#include "SiteFile.h" +#include namespace ripple { namespace SiteFiles { diff --git a/src/ripple/sitefiles/api/Manager.h b/src/ripple/sitefiles/api/Manager.h index bdd9d6b856..9c3c486fa2 100644 --- a/src/ripple/sitefiles/api/Manager.h +++ b/src/ripple/sitefiles/api/Manager.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_SITEFILES_MANAGER_H_INCLUDED #define RIPPLE_SITEFILES_MANAGER_H_INCLUDED -#include "Listener.h" +#include -#include "../../../beast/beast/utility/PropertyStream.h" +#include namespace ripple { namespace SiteFiles { diff --git a/src/ripple/sitefiles/api/Section.h b/src/ripple/sitefiles/api/Section.h index 43d75f2ab9..4d7730988c 100644 --- a/src/ripple/sitefiles/api/Section.h +++ b/src/ripple/sitefiles/api/Section.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SITEFILES_SECTION_H_INCLUDED #define RIPPLE_SITEFILES_SECTION_H_INCLUDED -#include "../../common/UnorderedContainers.h" +#include #include namespace ripple { diff --git a/src/ripple/sitefiles/api/SiteFile.h b/src/ripple/sitefiles/api/SiteFile.h index 5c6afcdb21..1f74a07f16 100644 --- a/src/ripple/sitefiles/api/SiteFile.h +++ b/src/ripple/sitefiles/api/SiteFile.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SITEFILES_SITEFILE_H_INCLUDED #define RIPPLE_SITEFILES_SITEFILE_H_INCLUDED -#include "Section.h" -#include "../../common/UnorderedContainers.h" +#include +#include #include #include diff --git a/src/ripple/sitefiles/impl/Logic.h b/src/ripple/sitefiles/impl/Logic.h index 4d98ddb098..1f242b9158 100644 --- a/src/ripple/sitefiles/impl/Logic.h +++ b/src/ripple/sitefiles/impl/Logic.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SITEFILES_LOGIC_H_INCLUDED #define RIPPLE_SITEFILES_LOGIC_H_INCLUDED -#include "../../common/UnorderedContainers.h" +#include #include diff --git a/src/ripple/sitefiles/ripple_sitefiles.h b/src/ripple/sitefiles/ripple_sitefiles.h index ac1ced784a..68c7aa5ce5 100644 --- a/src/ripple/sitefiles/ripple_sitefiles.h +++ b/src/ripple/sitefiles/ripple_sitefiles.h @@ -22,14 +22,14 @@ #include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include -#include "../../beast/beast/http/URL.h" -#include "../../beast/beast/Threads.h" +#include +#include -# include "api/Section.h" -# include "api/SiteFile.h" -# include "api/Listener.h" -#include "api/Manager.h" +#include +#include +#include +#include #endif diff --git a/src/ripple/sitefiles/ripple_sitefiles.unity.cpp b/src/ripple/sitefiles/ripple_sitefiles.unity.cpp index 75d6f03806..6f19d1f97c 100644 --- a/src/ripple/sitefiles/ripple_sitefiles.unity.cpp +++ b/src/ripple/sitefiles/ripple_sitefiles.unity.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_sitefiles.h" +#include -#include "../../beast/modules/beast_asio/beast_asio.h" // HTTPClientBase +#include // HTTPClientBase -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include -# include "impl/Site.h" -# include "impl/Logic.h" -#include "impl/Manager.cpp" -#include "impl/Section.cpp" -#include "impl/SiteFile.cpp" +#include +#include +#include +#include +#include diff --git a/src/ripple/sslutil/api/CAutoBN_CTX.h b/src/ripple/sslutil/api/CAutoBN_CTX.h index b21d03d764..2c3467f79e 100644 --- a/src/ripple/sslutil/api/CAutoBN_CTX.h +++ b/src/ripple/sslutil/api/CAutoBN_CTX.h @@ -25,7 +25,7 @@ #ifndef RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED #define RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED -#include "bignum_error.h" +#include namespace ripple { diff --git a/src/ripple/sslutil/impl/ECDSACanonical.cpp b/src/ripple/sslutil/impl/ECDSACanonical.cpp index ce5a6448bb..48ac934846 100644 --- a/src/ripple/sslutil/impl/ECDSACanonical.cpp +++ b/src/ripple/sslutil/impl/ECDSACanonical.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" +#include #include #include diff --git a/src/ripple/sslutil/ripple_sslutil.h b/src/ripple/sslutil/ripple_sslutil.h index 101edb6bfd..1950014324 100644 --- a/src/ripple/sslutil/ripple_sslutil.h +++ b/src/ripple/sslutil/ripple_sslutil.h @@ -20,18 +20,18 @@ #ifndef RIPPLE_SSLUTIL_H_INCLUDED #define RIPPLE_SSLUTIL_H_INCLUDED -#include "../types/ripple_types.h" +#include #include #include #include #include -# include "api/bignum_error.h" -#include "api/CAutoBN_CTX.h" -#include "api/CBigNum.h" -#include "api/DHUtil.h" -#include "api/HashUtilities.h" -#include "api/ECDSACanonical.h" +#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/sslutil/ripple_sslutil.unity.cpp b/src/ripple/sslutil/ripple_sslutil.unity.cpp index 2cbe3def59..b81132956c 100644 --- a/src/ripple/sslutil/ripple_sslutil.unity.cpp +++ b/src/ripple/sslutil/ripple_sslutil.unity.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_sslutil.h" +#include -#include "impl/CBigNum.cpp" -#include "impl/ECDSACanonical.cpp" -#include "impl/DHUtil.cpp" -#include "impl/HashUtilities.cpp" +#include +#include +#include +#include diff --git a/src/ripple/testoverlay/impl/TestOverlay.cpp b/src/ripple/testoverlay/impl/TestOverlay.cpp index 0bd8a66453..3f44ed487e 100644 --- a/src/ripple/testoverlay/impl/TestOverlay.cpp +++ b/src/ripple/testoverlay/impl/TestOverlay.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../common/UnorderedContainers.h" +#include -#include "../../../beast/beast/unit_test/suite.h" +#include #include #include diff --git a/src/ripple/testoverlay/ripple_testoverlay.h b/src/ripple/testoverlay/ripple_testoverlay.h index 93efe91e9c..8cd05a7753 100644 --- a/src/ripple/testoverlay/ripple_testoverlay.h +++ b/src/ripple/testoverlay/ripple_testoverlay.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TESTOVERLAY_H_INCLUDED #define RIPPLE_TESTOVERLAY_H_INCLUDED -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include -#include "../../beast/modules/beast_core/beast_core.h" +#include #include @@ -40,16 +40,16 @@ namespace ripple { -# include "api/Results.h" -# include "api/SimplePayload.h" -# include "api/MessageType.h" -# include "api/ConnectionType.h" -# include "api/PeerType.h" -# include "api/NetworkType.h" -# include "api/StateBase.h" -# include "api/PeerLogicBase.h" -# include "api/InitPolicy.h" -# include "api/ConfigType.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include } diff --git a/src/ripple/testoverlay/ripple_testoverlay.unity.cpp b/src/ripple/testoverlay/ripple_testoverlay.unity.cpp index 753bc544f0..1aad445840 100644 --- a/src/ripple/testoverlay/ripple_testoverlay.unity.cpp +++ b/src/ripple/testoverlay/ripple_testoverlay.unity.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_testoverlay.h" +#include -#include "impl/TestOverlay.cpp" +#include diff --git a/src/ripple/types/api/Base58.h b/src/ripple/types/api/Base58.h index 6ff8272a14..6a9b06982d 100644 --- a/src/ripple/types/api/Base58.h +++ b/src/ripple/types/api/Base58.h @@ -35,7 +35,7 @@ #include #include -#include "Blob.h" +#include namespace ripple { diff --git a/src/ripple/types/api/CryptoIdentifier.h b/src/ripple/types/api/CryptoIdentifier.h index f7723b6253..59d2dde804 100644 --- a/src/ripple/types/api/CryptoIdentifier.h +++ b/src/ripple/types/api/CryptoIdentifier.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED #define RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED -#include "../../../beast/beast/ByteOrder.h" -#include "../../../beast/beast/crypto/Sha256.h" +#include +#include #include -#include "Base58.h" +#include -#include "IdentifierStorage.h" +#include namespace ripple { diff --git a/src/ripple/types/api/IdentifierStorage.h b/src/ripple/types/api/IdentifierStorage.h index 62e2c5aaf6..2128bb163d 100644 --- a/src/ripple/types/api/IdentifierStorage.h +++ b/src/ripple/types/api/IdentifierStorage.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED #define RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED -#include "../../../beast/beast/crypto/MurmurHash.h" -#include "../../../beast/beast/container/hardened_hash.h" +#include +#include #include diff --git a/src/ripple/types/api/RandomNumbers.h b/src/ripple/types/api/RandomNumbers.h index 84602e26f4..80d5182d97 100644 --- a/src/ripple/types/api/RandomNumbers.h +++ b/src/ripple/types/api/RandomNumbers.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RANDOMNUMBERS_H #define RIPPLE_TYPES_RANDOMNUMBERS_H -#include "../../../beast/beast/utility/Journal.h" +#include namespace ripple { diff --git a/src/ripple/types/api/RippleAccountID.h b/src/ripple/types/api/RippleAccountID.h index bff1e3f572..2f4e435d0d 100644 --- a/src/ripple/types/api/RippleAccountID.h +++ b/src/ripple/types/api/RippleAccountID.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTID_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTID_H_INCLUDED -#include "CryptoIdentifier.h" -#include "IdentifierType.h" +#include +#include #include diff --git a/src/ripple/types/api/RippleAccountPrivateKey.h b/src/ripple/types/api/RippleAccountPrivateKey.h index f3de47916c..375fd1abed 100644 --- a/src/ripple/types/api/RippleAccountPrivateKey.h +++ b/src/ripple/types/api/RippleAccountPrivateKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTPRIVATEKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTPRIVATEKEY_H_INCLUDED -#include "CryptoIdentifier.h" +#include namespace ripple { diff --git a/src/ripple/types/api/RippleAccountPublicKey.h b/src/ripple/types/api/RippleAccountPublicKey.h index 20d44ecbe4..6408e4984c 100644 --- a/src/ripple/types/api/RippleAccountPublicKey.h +++ b/src/ripple/types/api/RippleAccountPublicKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEACCOUNTPUBLICKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEACCOUNTPUBLICKEY_H_INCLUDED -#include "CryptoIdentifier.h" +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePrivateKey.h b/src/ripple/types/api/RipplePrivateKey.h index 568b966c76..89f76abadd 100644 --- a/src/ripple/types/api/RipplePrivateKey.h +++ b/src/ripple/types/api/RipplePrivateKey.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEPRIVATEKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPRIVATEKEY_H_INCLUDED -#include "CryptoIdentifier.h" +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePublicKey.h b/src/ripple/types/api/RipplePublicKey.h index fb5ad4e36d..d49b3f0ce3 100644 --- a/src/ripple/types/api/RipplePublicKey.h +++ b/src/ripple/types/api/RipplePublicKey.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TYPES_RIPPLEPUBLICKEY_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPUBLICKEY_H_INCLUDED -#include "CryptoIdentifier.h" -#include "IdentifierType.h" +#include +#include namespace ripple { diff --git a/src/ripple/types/api/RipplePublicKeyHash.h b/src/ripple/types/api/RipplePublicKeyHash.h index 8068b9dbb1..9671304b31 100644 --- a/src/ripple/types/api/RipplePublicKeyHash.h +++ b/src/ripple/types/api/RipplePublicKeyHash.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_RIPPLEPUBLICKEYHASH_H_INCLUDED #define RIPPLE_TYPES_RIPPLEPUBLICKEYHASH_H_INCLUDED -#include "SimpleIdentifier.h" +#include namespace ripple { diff --git a/src/ripple/types/api/UInt160.h b/src/ripple/types/api/UInt160.h index 755bcb9c72..6ae46f47e5 100644 --- a/src/ripple/types/api/UInt160.h +++ b/src/ripple/types/api/UInt160.h @@ -25,8 +25,8 @@ #ifndef RIPPLE_TYPES_UINT160_H_INCLUDED #define RIPPLE_TYPES_UINT160_H_INCLUDED -#include "base_uint.h" -#include "strHex.h" +#include +#include namespace ripple { diff --git a/src/ripple/types/api/base_uint.h b/src/ripple/types/api/base_uint.h index 6f1cd40b54..6bae235e00 100644 --- a/src/ripple/types/api/base_uint.h +++ b/src/ripple/types/api/base_uint.h @@ -25,11 +25,11 @@ #ifndef RIPPLE_TYPES_BASE_UINT_H_INCLUDED #define RIPPLE_TYPES_BASE_UINT_H_INCLUDED -#include "Blob.h" -#include "strHex.h" -#include "ByteOrder.h" +#include +#include +#include -#include "../../../beast/beast/container/hardened_hash.h" +#include #include diff --git a/src/ripple/types/impl/RandomNumbers.cpp b/src/ripple/types/impl/RandomNumbers.cpp index c962420f41..9682366c5a 100644 --- a/src/ripple/types/impl/RandomNumbers.cpp +++ b/src/ripple/types/impl/RandomNumbers.cpp @@ -26,13 +26,13 @@ // #include #if BEAST_WIN32 -# include -# include +#include +#include #endif #if BEAST_LINUX || BEAST_BSD || BEAST_MAC || BEAST_IOS -# include +#include #else -# include +#include #endif #include diff --git a/src/ripple/types/impl/RippleAssets.cpp b/src/ripple/types/impl/RippleAssets.cpp index 8924299d44..16f03767c5 100644 --- a/src/ripple/types/impl/RippleAssets.cpp +++ b/src/ripple/types/impl/RippleAssets.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../common/UnorderedContainers.h" +#include -#include "../../../beast/beast/unit_test/suite.h" +#include #include diff --git a/src/ripple/types/ripple_types.h b/src/ripple/types/ripple_types.h index d5a6cb9bf5..d429e37b75 100644 --- a/src/ripple/types/ripple_types.h +++ b/src/ripple/types/ripple_types.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_TYPES_H_INCLUDED #define RIPPLE_TYPES_H_INCLUDED -#include "../json/ripple_json.h" +#include -#include "../../beast/beast/Crypto.h" +#include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -33,33 +33,33 @@ #if BEAST_WIN32 // (nothing) #elif __APPLE__ -# include +#include #elif defined(__FreeBSD__) || defined(__NetBSD__) -# include +#include #elif defined(__OpenBSD__) -# include +#include #endif -#include "api/AgedHistory.h" -# include "api/Blob.h" -# include "api/Base58.h" -# include "api/ByteOrder.h" -# include "api/strHex.h" -# include "api/UInt160.h" -# include "api/RandomNumbers.h" -#include "api/HashMaps.h" +#include +#include +#include +#include +#include +#include +#include +#include -# include "api/IdentifierType.h" -# include "api/IdentifierStorage.h" -# include "api/CryptoIdentifier.h" -#include "api/RippleAccountID.h" -#include "api/RippleAccountPublicKey.h" -#include "api/RippleAccountPrivateKey.h" -#include "api/RippleAssets.h" -#include "api/RipplePublicKey.h" -#include "api/RipplePrivateKey.h" -# include "api/SimpleIdentifier.h" -#include "api/RippleLedgerHash.h" -#include "api/RipplePublicKeyHash.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple/types/ripple_types.unity.cpp b/src/ripple/types/ripple_types.unity.cpp index dd73f87d0f..246f23a820 100644 --- a/src/ripple/types/ripple_types.unity.cpp +++ b/src/ripple/types/ripple_types.unity.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_types.h" -#include "../sslutil/ripple_sslutil.h" +#include +#include #ifdef BEAST_WIN32 -# include // for ByteOrder.cpp +#include // for ByteOrder.cpp // defines min, max and does other stupid things # ifdef max # undef max @@ -39,14 +39,14 @@ #include #include -#include "impl/Base58.cpp" -#include "impl/ByteOrder.cpp" -#include "impl/RandomNumbers.cpp" -#include "impl/strHex.cpp" -#include "impl/base_uint.cpp" -#include "impl/UInt160.cpp" -#include "impl/RippleIdentifierTests.cpp" -#include "impl/RippleAssets.cpp" +#include +#include +#include +#include +#include +#include +#include +#include -#include "../common/tests/cross_offer.test.cpp" +#include diff --git a/src/ripple/validators/api/Manager.h b/src/ripple/validators/api/Manager.h index 0147006c09..1d9a684c02 100644 --- a/src/ripple/validators/api/Manager.h +++ b/src/ripple/validators/api/Manager.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_VALIDATORS_MANAGER_H_INCLUDED #define RIPPLE_VALIDATORS_MANAGER_H_INCLUDED -#include "../../../beast/beast/threads/Stoppable.h" -#include "../../../beast/modules/beast_core/files/File.h" +#include +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/api/Source.h b/src/ripple/validators/api/Source.h index 5f1c0ad9b0..13f2a55b8d 100644 --- a/src/ripple/validators/api/Source.h +++ b/src/ripple/validators/api/Source.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED #define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED -#include "../../../beast/beast/smart_ptr/SharedObject.h" -#include "../../../beast/modules/beast_core/time/Time.h" +#include +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/impl/ChosenList.h b/src/ripple/validators/impl/ChosenList.h index fc47a6c7a9..ecf500b644 100644 --- a/src/ripple/validators/impl/ChosenList.h +++ b/src/ripple/validators/impl/ChosenList.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED #define RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED -#include "../../common/UnorderedContainers.h" +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/impl/Tests.cpp b/src/ripple/validators/impl/Tests.cpp index 15455bbfad..c34f12694b 100644 --- a/src/ripple/validators/impl/Tests.cpp +++ b/src/ripple/validators/impl/Tests.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/beast/unit_test/suite.h" +#include namespace ripple { namespace Validators { diff --git a/src/ripple/validators/impl/Tuning.h b/src/ripple/validators/impl/Tuning.h index 7ae8c529f4..642869f432 100644 --- a/src/ripple/validators/impl/Tuning.h +++ b/src/ripple/validators/impl/Tuning.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_TUNING_H_INCLUDED #define RIPPLE_VALIDATORS_TUNING_H_INCLUDED -#include "../../common/UnorderedContainers.h" +#include #include diff --git a/src/ripple/validators/ripple_validators.h b/src/ripple/validators/ripple_validators.h index 36a9e58d82..e2ffb6134c 100644 --- a/src/ripple/validators/ripple_validators.h +++ b/src/ripple/validators/ripple_validators.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_VALIDATORS_H_INCLUDED #define RIPPLE_VALIDATORS_H_INCLUDED -#include "../../beast/beast/http/URL.h" +#include -#include "../types/ripple_types.h" +#include -# include "api/Types.h" -# include "api/Source.h" -#include "api/Manager.h" +#include +#include +#include #endif diff --git a/src/ripple/validators/ripple_validators.unity.cpp b/src/ripple/validators/ripple_validators.unity.cpp index f5f98afb4c..244d93c84d 100644 --- a/src/ripple/validators/ripple_validators.unity.cpp +++ b/src/ripple/validators/ripple_validators.unity.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../BeastConfig.h" +#include -#include "ripple_validators.h" +#include -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -30,32 +30,32 @@ #include -#include "../../beast/beast/threads/ScopedWrapperContext.h" -#include "../../beast/modules/beast_asio/beast_asio.h" -#include "../../beast/modules/beast_sqdb/beast_sqdb.h" +#include +#include +#include -#include "../algorithm/api/CycledSet.h" -#include "../testoverlay/ripple_testoverlay.h" // for unit test +#include +#include // for unit test -# include "impl/Tuning.h" -# include "impl/ChosenList.h" -# include "impl/Count.h" -# include "impl/SourceFile.h" -# include "impl/SourceStrings.h" -# include "impl/SourceURL.h" -# include "impl/SourceDesc.h" -# include "impl/Store.h" -# include "impl/StoreSqdb.h" -# include "impl/Utilities.h" -# include "impl/Validation.h" -# include "impl/Validator.h" -#include "impl/Logic.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "impl/Manager.cpp" -#include "impl/Source.cpp" -#include "impl/SourceFile.cpp" -#include "impl/SourceStrings.cpp" -#include "impl/SourceURL.cpp" -#include "impl/StoreSqdb.cpp" -#include "impl/Tests.cpp" -#include "impl/Utilities.cpp" +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple_app/book/Amount.h b/src/ripple_app/book/Amount.h index 0c36287845..dc3d3df0e9 100644 --- a/src/ripple_app/book/Amount.h +++ b/src/ripple_app/book/Amount.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED #define RIPPLE_CORE_AMOUNT_H_INCLUDED -#include "../../ripple_data/protocol/SerializedObject.h" +#include -#include "../../beast/beast/utility/noexcept.h" -#include "../../beast/beast/cxx14/type_traits.h" // +#include +#include // namespace ripple { namespace core { diff --git a/src/ripple_app/book/Amounts.h b/src/ripple_app/book/Amounts.h index f8621bbb72..d029b3d7b9 100644 --- a/src/ripple_app/book/Amounts.h +++ b/src/ripple_app/book/Amounts.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_AMOUNTS_H_INCLUDED #define RIPPLE_CORE_AMOUNTS_H_INCLUDED -#include "Amount.h" +#include -#include "../../beast/beast/utility/noexcept.h" +#include namespace ripple { namespace core { diff --git a/src/ripple_app/book/BookTip.h b/src/ripple_app/book/BookTip.h index accec7457d..85e3e85b78 100644 --- a/src/ripple_app/book/BookTip.h +++ b/src/ripple_app/book/BookTip.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CORE_BOOKTIP_H_INCLUDED #define RIPPLE_CORE_BOOKTIP_H_INCLUDED -#include "Quality.h" -#include "Types.h" +#include +#include -#include "../../beast/beast/utility/noexcept.h" +#include #include diff --git a/src/ripple_app/book/Offer.h b/src/ripple_app/book/Offer.h index f779a70ca9..13f5fe711e 100644 --- a/src/ripple_app/book/Offer.h +++ b/src/ripple_app/book/Offer.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_CORE_OFFER_H_INCLUDED #define RIPPLE_CORE_OFFER_H_INCLUDED -#include "Amounts.h" -#include "Quality.h" -#include "Types.h" +#include +#include +#include -#include "../misc/SerializedLedger.h" -#include "../../ripple_data/protocol/FieldNames.h" +#include +#include -#include "../../beast/beast/utility/noexcept.h" +#include #include diff --git a/src/ripple_app/book/OfferStream.h b/src/ripple_app/book/OfferStream.h index 6140328604..41ef54f6a3 100644 --- a/src/ripple_app/book/OfferStream.h +++ b/src/ripple_app/book/OfferStream.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CORE_OFFERSTREAM_H_INCLUDED #define RIPPLE_CORE_OFFERSTREAM_H_INCLUDED -#include "BookTip.h" -#include "Offer.h" -#include "Quality.h" -#include "Types.h" +#include +#include +#include +#include -#include "../../beast/beast/utility/noexcept.h" +#include #include diff --git a/src/ripple_app/book/Quality.h b/src/ripple_app/book/Quality.h index cce99bd475..1633226cdf 100644 --- a/src/ripple_app/book/Quality.h +++ b/src/ripple_app/book/Quality.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_QUALITY_H_INCLUDED #define RIPPLE_CORE_QUALITY_H_INCLUDED -#include "Amount.h" -#include "Amounts.h" +#include +#include #include #include diff --git a/src/ripple_app/book/Taker.h b/src/ripple_app/book/Taker.h index f4edf63c0d..bffe93b6ac 100644 --- a/src/ripple_app/book/Taker.h +++ b/src/ripple_app/book/Taker.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_CORE_TAKER_H_INCLUDED #define RIPPLE_CORE_TAKER_H_INCLUDED -#include "Amounts.h" -#include "Quality.h" -#include "Offer.h" -#include "Types.h" +#include +#include +#include +#include -#include "../../beast/beast/streams/debug_ostream.h" -#include "../../beast/beast/utility/noexcept.h" +#include +#include #include //#include diff --git a/src/ripple_app/book/Types.h b/src/ripple_app/book/Types.h index a1b26721fb..5ff38473e9 100644 --- a/src/ripple_app/book/Types.h +++ b/src/ripple_app/book/Types.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_TYPES_H_INCLUDED #define RIPPLE_CORE_TYPES_H_INCLUDED -#include "../ledger/LedgerEntrySet.h" -#include "../../ripple/types/api/RippleAssets.h" -#include "../../ripple/types/api/base_uint.h" +#include +#include +#include #include #include diff --git a/src/ripple_app/book/impl/BookTip.cpp b/src/ripple_app/book/impl/BookTip.cpp index 61439d1320..998b9e664d 100644 --- a/src/ripple_app/book/impl/BookTip.cpp +++ b/src/ripple_app/book/impl/BookTip.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../BookTip.h" +#include namespace ripple { namespace core { diff --git a/src/ripple_app/book/impl/OfferStream.cpp b/src/ripple_app/book/impl/OfferStream.cpp index 49c45f9ffd..d340011109 100644 --- a/src/ripple_app/book/impl/OfferStream.cpp +++ b/src/ripple_app/book/impl/OfferStream.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../OfferStream.h" +#include namespace ripple { namespace core { diff --git a/src/ripple_app/book/impl/Quality.cpp b/src/ripple_app/book/impl/Quality.cpp index 2b942d3870..9ccccd393d 100644 --- a/src/ripple_app/book/impl/Quality.cpp +++ b/src/ripple_app/book/impl/Quality.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../Quality.h" +#include #include #include diff --git a/src/ripple_app/book/impl/Taker.cpp b/src/ripple_app/book/impl/Taker.cpp index d673ace681..583db88b57 100644 --- a/src/ripple_app/book/impl/Taker.cpp +++ b/src/ripple_app/book/impl/Taker.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../Taker.h" +#include //#include diff --git a/src/ripple_app/book/tests/OfferStream.test.cpp b/src/ripple_app/book/tests/OfferStream.test.cpp index e4afc59c98..a4917f59eb 100644 --- a/src/ripple_app/book/tests/OfferStream.test.cpp +++ b/src/ripple_app/book/tests/OfferStream.test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../OfferStream.h" +#include -#include "../../../beast/beast/unit_test/suite.h" +#include namespace ripple { namespace core { diff --git a/src/ripple_app/book/tests/Quality.test.cpp b/src/ripple_app/book/tests/Quality.test.cpp index fc61fd023e..c250e326cb 100644 --- a/src/ripple_app/book/tests/Quality.test.cpp +++ b/src/ripple_app/book/tests/Quality.test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../Quality.h" +#include -#include "../../../beast/beast/unit_test/suite.h" -#include "../../../beast/beast/cxx14/type_traits.h" +#include +#include namespace ripple { namespace core { diff --git a/src/ripple_app/consensus/LedgerConsensus.cpp b/src/ripple_app/consensus/LedgerConsensus.cpp index 9ecef11af0..2dee223819 100644 --- a/src/ripple_app/consensus/LedgerConsensus.cpp +++ b/src/ripple_app/consensus/LedgerConsensus.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_overlay/api/predicates.h" +#include namespace ripple { diff --git a/src/ripple_app/data/SqliteDatabase.h b/src/ripple_app/data/SqliteDatabase.h index 45beb7474f..b97843581c 100644 --- a/src/ripple_app/data/SqliteDatabase.h +++ b/src/ripple_app/data/SqliteDatabase.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SQLITEDATABASE_H_INCLUDED #define RIPPLE_SQLITEDATABASE_H_INCLUDED -#include "../../beast/beast/threads/Thread.h" +#include namespace ripple { diff --git a/src/ripple_app/ledger/InboundLedger.cpp b/src/ripple_app/ledger/InboundLedger.cpp index 2dcec348ca..abc7bdeeff 100644 --- a/src/ripple_app/ledger/InboundLedger.cpp +++ b/src/ripple_app/ledger/InboundLedger.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_overlay/api/Overlay.h" +#include namespace ripple { diff --git a/src/ripple_app/ledger/Ledger.cpp b/src/ripple_app/ledger/Ledger.cpp index fcb8779690..4d28f50f18 100644 --- a/src/ripple_app/ledger/Ledger.cpp +++ b/src/ripple_app/ledger/Ledger.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../ripple/common/jsonrpc_fields.h" +#include -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_app/main/Application.cpp b/src/ripple_app/main/Application.cpp index a9e1b407e4..7028cdc5c5 100644 --- a/src/ripple_app/main/Application.cpp +++ b/src/ripple_app/main/Application.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include "Tuning.h" +#include -#include "../../ripple/common/seconds_clock.h" -#include "../../ripple_rpc/api/Manager.h" -#include "../../ripple_overlay/api/make_Overlay.h" -#include "../../ripple_overlay/api/make_Overlay.h" -#include "../../ripple/common/seconds_clock.h" -#include "../../ripple_rpc/api/Manager.h" +#include +#include +#include +#include +#include +#include -#include "../../beast/modules/beast_core/thread/DeadlineTimer.h" +#include namespace ripple { diff --git a/src/ripple_app/main/Application.h b/src/ripple_app/main/Application.h index c9962c3cc8..edb48fc4bf 100644 --- a/src/ripple_app/main/Application.h +++ b/src/ripple_app/main/Application.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_APPLICATION_H_INCLUDED #define RIPPLE_APP_APPLICATION_H_INCLUDED -#include "FullBelowCache.h" +#include namespace ripple { diff --git a/src/ripple_app/main/CollectorManager.h b/src/ripple_app/main/CollectorManager.h index fcd6112d69..a3c6a9407a 100644 --- a/src/ripple_app/main/CollectorManager.h +++ b/src/ripple_app/main/CollectorManager.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RIPPLECOLLECTOR_H_INCLUDED #define RIPPLE_RIPPLECOLLECTOR_H_INCLUDED -#include "../../beast/beast/Insight.h" +#include namespace ripple { diff --git a/src/ripple_app/main/FatalErrorReporter.cpp b/src/ripple_app/main/FatalErrorReporter.cpp index 9a6464fb05..eb29e29fa3 100644 --- a/src/ripple_app/main/FatalErrorReporter.cpp +++ b/src/ripple_app/main/FatalErrorReporter.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_app/main/FatalErrorReporter.h b/src/ripple_app/main/FatalErrorReporter.h index f692d516e8..99b8216e01 100644 --- a/src/ripple_app/main/FatalErrorReporter.h +++ b/src/ripple_app/main/FatalErrorReporter.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_FATALERRORREPORTER_H_INCLUDED #define RIPPLE_FATALERRORREPORTER_H_INCLUDED -#include "../../beast/modules/beast_core/diagnostic/FatalError.h" +#include namespace ripple { diff --git a/src/ripple_app/main/FullBelowCache.h b/src/ripple_app/main/FullBelowCache.h index df8e9977f1..89187a94ce 100644 --- a/src/ripple_app/main/FullBelowCache.h +++ b/src/ripple_app/main/FullBelowCache.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_FULLBELOWCACHE_H_INCLUDED #define RIPPLE_FULLBELOWCACHE_H_INCLUDED -#include "../../ripple/types/api/base_uint.h" -#include "../../ripple/radmap/api/BasicFullBelowCache.h" +#include +#include namespace ripple { diff --git a/src/ripple_app/main/IoServicePool.cpp b/src/ripple_app/main/IoServicePool.cpp index 863d046ef9..d3a4cfd233 100644 --- a/src/ripple_app/main/IoServicePool.cpp +++ b/src/ripple_app/main/IoServicePool.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/cxx14/memory.h" // +#include // namespace ripple { diff --git a/src/ripple_app/main/Main.cpp b/src/ripple_app/main/Main.cpp index cff234a1c5..d6b52ad313 100644 --- a/src/ripple_app/main/Main.cpp +++ b/src/ripple_app/main/Main.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../beast/beast/unit_test.h" -#include "../../beast/beast/streams/debug_ostream.h" -#include "../../ripple_basics/system/CheckLibraryVersions.h" +#include +#include +#include namespace po = boost::program_options; diff --git a/src/ripple_app/main/ParameterTable.cpp b/src/ripple_app/main/ParameterTable.cpp index ae94adeebb..9f3c0acae2 100644 --- a/src/ripple_app/main/ParameterTable.cpp +++ b/src/ripple_app/main/ParameterTable.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple/common/jsonrpc_fields.h" +#include namespace ripple { diff --git a/src/ripple_app/main/RPCHTTPServer.cpp b/src/ripple_app/main/RPCHTTPServer.cpp index de33a51fab..9f3a2f19bf 100644 --- a/src/ripple_app/main/RPCHTTPServer.cpp +++ b/src/ripple_app/main/RPCHTTPServer.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple/common/RippleSSLContext.h" +#include namespace ripple { diff --git a/src/ripple_app/misc/AmendmentTable.h b/src/ripple_app/misc/AmendmentTable.h index e90cd0372b..1dc10c1fe2 100644 --- a/src/ripple_app/misc/AmendmentTable.h +++ b/src/ripple_app/misc/AmendmentTable.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_AMENDMENT_TABLE_H #define RIPPLE_AMENDMENT_TABLE_H -#include "../book/Types.h" +#include namespace ripple { diff --git a/src/ripple_app/misc/NetworkOPs.cpp b/src/ripple_app/misc/NetworkOPs.cpp index a787b13958..a24da423d5 100644 --- a/src/ripple_app/misc/NetworkOPs.cpp +++ b/src/ripple_app/misc/NetworkOPs.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../ripple_overlay/api/predicates.h" -#include "../../ripple/common/jsonrpc_fields.h" +#include +#include -#include "../../beast/modules/beast_core/thread/DeadlineTimer.h" -#include "../../beast/modules/beast_core/system/SystemStats.h" +#include +#include #include namespace ripple { diff --git a/src/ripple_app/misc/ProofOfWork.h b/src/ripple_app/misc/ProofOfWork.h index 2fdab40282..f2af613645 100644 --- a/src/ripple_app/misc/ProofOfWork.h +++ b/src/ripple_app/misc/ProofOfWork.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PROOFOFWORK_H #define RIPPLE_PROOFOFWORK_H -#include "PowResult.h" +#include namespace ripple { diff --git a/src/ripple_app/misc/ProofOfWorkFactory.cpp b/src/ripple_app/misc/ProofOfWorkFactory.cpp index 1b3f4e557d..1f66f5b3e7 100644 --- a/src/ripple_app/misc/ProofOfWorkFactory.cpp +++ b/src/ripple_app/misc/ProofOfWorkFactory.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include #include diff --git a/src/ripple_app/misc/ProofOfWorkFactory.h b/src/ripple_app/misc/ProofOfWorkFactory.h index a3d00058bc..39baae0c49 100644 --- a/src/ripple_app/misc/ProofOfWorkFactory.h +++ b/src/ripple_app/misc/ProofOfWorkFactory.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_PROOFOFWORKFACTORY_H_INCLUDED #define RIPPLE_PROOFOFWORKFACTORY_H_INCLUDED -#include "PowResult.h" -#include "ProofOfWork.h" +#include +#include namespace ripple { diff --git a/src/ripple_app/misc/SerializedTransaction.cpp b/src/ripple_app/misc/SerializedTransaction.cpp index d1c0db88cf..7fbd13a334 100644 --- a/src/ripple_app/misc/SerializedTransaction.cpp +++ b/src/ripple_app/misc/SerializedTransaction.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNode.cpp b/src/ripple_app/paths/CalcNode.cpp index deea895b02..fdc7df8dfb 100644 --- a/src/ripple_app/paths/CalcNode.cpp +++ b/src/ripple_app/paths/CalcNode.cpp @@ -19,10 +19,10 @@ #include -#include "CalcState.h" -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeAccountFwd.cpp b/src/ripple_app/paths/CalcNodeAccountFwd.cpp index 9778e054ad..8ccf92d2b6 100644 --- a/src/ripple_app/paths/CalcNodeAccountFwd.cpp +++ b/src/ripple_app/paths/CalcNodeAccountFwd.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeAccountRev.cpp b/src/ripple_app/paths/CalcNodeAccountRev.cpp index c2a57b3c52..cda3c3f78b 100644 --- a/src/ripple_app/paths/CalcNodeAccountRev.cpp +++ b/src/ripple_app/paths/CalcNodeAccountRev.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeAdvance.cpp b/src/ripple_app/paths/CalcNodeAdvance.cpp index f7af10b7b8..db21021845 100644 --- a/src/ripple_app/paths/CalcNodeAdvance.cpp +++ b/src/ripple_app/paths/CalcNodeAdvance.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeDeliverFwd.cpp b/src/ripple_app/paths/CalcNodeDeliverFwd.cpp index c5a9634742..22cbf8942b 100644 --- a/src/ripple_app/paths/CalcNodeDeliverFwd.cpp +++ b/src/ripple_app/paths/CalcNodeDeliverFwd.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeDeliverRev.cpp b/src/ripple_app/paths/CalcNodeDeliverRev.cpp index 147ed33b4b..ae679caf6a 100644 --- a/src/ripple_app/paths/CalcNodeDeliverRev.cpp +++ b/src/ripple_app/paths/CalcNodeDeliverRev.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeOffer.cpp b/src/ripple_app/paths/CalcNodeOffer.cpp index 41c7fc440e..b60411ec9c 100644 --- a/src/ripple_app/paths/CalcNodeOffer.cpp +++ b/src/ripple_app/paths/CalcNodeOffer.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/CalcNodeRipple.cpp b/src/ripple_app/paths/CalcNodeRipple.cpp index 3453524dcf..6d31d2e337 100644 --- a/src/ripple_app/paths/CalcNodeRipple.cpp +++ b/src/ripple_app/paths/CalcNodeRipple.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "Calculators.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/PathNext.cpp b/src/ripple_app/paths/PathNext.cpp index e9fcd57ff5..2781f774cc 100644 --- a/src/ripple_app/paths/PathNext.cpp +++ b/src/ripple_app/paths/PathNext.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "Calculators.h" -#include "CalcState.h" -#include "RippleCalc.h" -#include "Tuning.h" +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/paths/PathRequest.cpp b/src/ripple_app/paths/PathRequest.cpp index e1be18c9c1..c3bbcc1e9d 100644 --- a/src/ripple_app/paths/PathRequest.cpp +++ b/src/ripple_app/paths/PathRequest.cpp @@ -19,7 +19,7 @@ #include -#include "Calculators.h" +#include namespace ripple { diff --git a/src/ripple_app/paths/Pathfinder.cpp b/src/ripple_app/paths/Pathfinder.cpp index a383d7f461..5317aab543 100644 --- a/src/ripple_app/paths/Pathfinder.cpp +++ b/src/ripple_app/paths/Pathfinder.cpp @@ -20,7 +20,7 @@ #include -#include "Calculators.h" +#include namespace ripple { diff --git a/src/ripple_app/paths/RippleCalc.cpp b/src/ripple_app/paths/RippleCalc.cpp index 381595988f..a3205c6d3a 100644 --- a/src/ripple_app/paths/RippleCalc.cpp +++ b/src/ripple_app/paths/RippleCalc.cpp @@ -17,17 +17,17 @@ */ //============================================================================== -#include "Calculators.h" +#include -#include "CalcNode.cpp" -#include "CalcNodeAccountFwd.cpp" -#include "CalcNodeAccountRev.cpp" -#include "CalcNodeAdvance.cpp" -#include "CalcNodeDeliverFwd.cpp" -#include "CalcNodeDeliverRev.cpp" -#include "CalcNodeOffer.cpp" -#include "CalcNodeRipple.cpp" -#include "PathNext.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/peers/PeerSet.cpp b/src/ripple_app/peers/PeerSet.cpp index c99534fe71..c747a32364 100644 --- a/src/ripple_app/peers/PeerSet.cpp +++ b/src/ripple_app/peers/PeerSet.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include"../../ripple_overlay/api/Overlay.h" +#include namespace ripple { diff --git a/src/ripple_app/peers/PeerSet.h b/src/ripple_app/peers/PeerSet.h index c32a95ac9b..0c2892f41b 100644 --- a/src/ripple_app/peers/PeerSet.h +++ b/src/ripple_app/peers/PeerSet.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_PEERSET_H #define RIPPLE_PEERSET_H -#include "../../ripple_overlay/api/Peer.h" +#include namespace ripple { diff --git a/src/ripple_app/peers/UniqueNodeList.cpp b/src/ripple_app/peers/UniqueNodeList.cpp index 93fb7a7fc6..906e73553c 100644 --- a/src/ripple_app/peers/UniqueNodeList.cpp +++ b/src/ripple_app/peers/UniqueNodeList.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/thread/DeadlineTimer.h" +#include #include #include diff --git a/src/ripple_app/ripple_app.h b/src/ripple_app/ripple_app.h index 104a10165e..29d46d7989 100644 --- a/src/ripple_app/ripple_app.h +++ b/src/ripple_app/ripple_app.h @@ -28,7 +28,7 @@ // purely abstract and move implementation into .cpp files. // -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -45,91 +45,91 @@ //------------------------------------------------------------------------------ -#include "../ripple_basics/ripple_basics.h" -#include "../ripple_core/ripple_core.h" -#include "../ripple_data/ripple_data.h" -#include "../ripple_net/ripple_net.h" +#include +#include +#include +#include -#include "../ripple/common/ResolverAsio.h" +#include // VFALCO TODO Remove this include -#include "../beast/modules/beast_sqlite/beast_sqlite.h" +#include // Order matters here. If you get compile errors, // reorder the include lines until the order is correct. -#include "../../ripple/common/KeyCache.h" -#include "../../ripple/common/TaggedCache.h" +#include +#include -#include "data/Database.h" -#include "data/DatabaseCon.h" -#include "data/SqliteDatabase.h" -#include "data/DBInit.h" -#include "shamap/SHAMapItem.h" -#include "shamap/SHAMapNode.h" -#include "shamap/SHAMapTreeNode.h" -#include "shamap/SHAMapMissingNode.h" -#include "shamap/SHAMapSyncFilter.h" -#include "shamap/SHAMapAddNode.h" -#include "shamap/SHAMap.h" -#include "misc/SerializedTransaction.h" -#include "misc/SerializedLedger.h" -#include "tx/TransactionMeta.h" -#include "tx/Transaction.h" -#include "misc/AccountState.h" -#include "misc/NicknameState.h" -#include "ledger/Ledger.h" -#include "ledger/SerializedValidation.h" -#include "main/LoadManager.h" -#include "misc/OrderBook.h" -#include "shamap/SHAMapSyncFilters.h" -#include "misc/AmendmentTable.h" -#include "misc/FeeVote.h" -#include "misc/IHashRouter.h" -#include "peers/ClusterNodeStatus.h" -#include "peers/UniqueNodeList.h" -#include "misc/Validations.h" -#include "peers/PeerSet.h" -#include "ledger/InboundLedger.h" -#include "ledger/InboundLedgers.h" -#include "misc/AccountItem.h" -#include "misc/AccountItems.h" -#include "ledger/AcceptedLedgerTx.h" -#include "ledger/AcceptedLedger.h" -#include "ledger/LedgerEntrySet.h" -#include "ledger/DirectoryEntryIterator.h" -#include "ledger/OrderBookIterator.h" -#include "tx/TransactionEngine.h" -#include "misc/CanonicalTXSet.h" -#include "ledger/LedgerHolder.h" -#include "ledger/LedgerHistory.h" -#include "ledger/LedgerCleaner.h" -#include "ledger/LedgerMaster.h" -#include "ledger/LedgerProposal.h" -#include "misc/NetworkOPs.h" -#include "tx/TransactionMaster.h" -#include "main/LocalCredentials.h" -#include "main/Application.h" -#include "ledger/OrderBookDB.h" -#include "tx/TransactionAcquire.h" -#include "tx/LocalTxs.h" -#include "consensus/DisputedTx.h" -#include "consensus/LedgerConsensus.h" -#include "ledger/LedgerTiming.h" -#include "misc/Offer.h" -#include "paths/RippleLineCache.h" -#include "paths/PathRequest.h" -#include "paths/PathRequests.h" -#include "main/ParameterTable.h" - #include "paths/RippleLineCache.h" - #include "paths/PathState.h" - #include "paths/RippleCalc.h" -#include "paths/Pathfinder.h" -#include "paths/RippleState.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include + #include + #include +#include +#include // VFALCO NOTE These contracts files are bunk -#include "contracts/ScriptData.h" -#include "contracts/Contract.h" -#include "contracts/Interpreter.h" -#include "contracts/Operation.h" +#include +#include +#include +#include #endif diff --git a/src/ripple_app/ripple_app.unity.cpp b/src/ripple_app/ripple_app.unity.cpp index 556153888d..4cb299ab76 100644 --- a/src/ripple_app/ripple_app.unity.cpp +++ b/src/ripple_app/ripple_app.unity.cpp @@ -19,7 +19,7 @@ #include "../../BeastConfig.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -27,69 +27,69 @@ #include #include -#include "ripple_app.h" +#include -#include "../ripple_net/ripple_net.h" -#include "../ripple_rpc/ripple_rpc.h" -#include "../ripple_websocket/ripple_websocket.h" -#include "../ripple/common/jsonrpc_fields.h" +#include +#include +#include +#include // This .cpp will end up including all of the public header // material in Ripple since it holds the Application object. -#include "../ripple/common/seconds_clock.h" -#include "../ripple/http/ripple_http.h" -#include "../ripple/resource/ripple_resource.h" -#include "../ripple/sitefiles/ripple_sitefiles.h" -#include "../ripple/validators/ripple_validators.h" +#include +#include +#include +#include +#include -#include "../beast/beast/asio/io_latency_probe.h" -#include "../beast/beast/cxx14/memory.h" +#include +#include #include // For Application.cpp -# include "main/CollectorManager.h" -#include "main/CollectorManager.cpp" +#include +#include -#include "misc/ProofOfWorkFactory.h" +#include -# include "main/NodeStoreScheduler.h" -#include "main/NodeStoreScheduler.cpp" +#include +#include -# include "main/IoServicePool.h" -#include "main/IoServicePool.cpp" +#include +#include -# include "main/FatalErrorReporter.h" -#include "main/FatalErrorReporter.cpp" +#include +#include -# include "rpc/RPCHandler.h" -# include "rpc/RPCServerHandler.h" -# include "main/RPCHTTPServer.h" -#include "main/RPCHTTPServer.cpp" -#include "rpc/RPCServerHandler.cpp" -#include "rpc/RPCHandler.cpp" +#include +#include +#include +#include +#include +#include -#include "websocket/WSConnection.h" +#include -# include "tx/TxQueueEntry.h" -#include "tx/TxQueueEntry.cpp" -# include "tx/TxQueue.h" -#include "tx/TxQueue.cpp" +#include +#include +#include +#include -# include "websocket/WSServerHandler.h" -#include "websocket/WSServerHandler.cpp" -#include "websocket/WSConnection.cpp" -# include "websocket/WSDoor.h" -#include "websocket/WSDoor.cpp" +#include +#include +#include +#include +#include -#include "../ripple/common/ResolverAsio.h" +#include -# include "node/SqliteFactory.h" -#include "node/SqliteFactory.cpp" +#include +#include -#include "main/Application.cpp" +#include -#include "main/Main.cpp" +#include //------------------------------------------------------------------------------ diff --git a/src/ripple_app/ripple_app_pt1.unity.cpp b/src/ripple_app/ripple_app_pt1.unity.cpp index f9a8c6bf90..1785c43ac2 100644 --- a/src/ripple_app/ripple_app_pt1.unity.cpp +++ b/src/ripple_app/ripple_app_pt1.unity.cpp @@ -19,29 +19,29 @@ #include "../../BeastConfig.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include -#include "ripple_app.h" +#include -#include "../ripple/validators/ripple_validators.h" +#include -#include "misc/PowResult.h" +#include -#include "misc/ProofOfWorkFactory.h" +#include -#include "peers/PeerSet.cpp" -#include "misc/OrderBook.cpp" -#include "misc/ProofOfWorkFactory.cpp" -#include "misc/ProofOfWork.cpp" -#include "misc/SerializedTransaction.cpp" +#include +#include +#include +#include +#include -#include "shamap/SHAMapSyncFilters.cpp" // requires Application +#include // requires Application -#include "consensus/LedgerConsensus.cpp" +#include -# include "ledger/LedgerCleaner.h" -#include "ledger/LedgerCleaner.cpp" -#include "ledger/LedgerMaster.cpp" +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt2.unity.cpp b/src/ripple_app/ripple_app_pt2.unity.cpp index e70acf6fae..715e1a453e 100644 --- a/src/ripple_app/ripple_app_pt2.unity.cpp +++ b/src/ripple_app/ripple_app_pt2.unity.cpp @@ -19,27 +19,27 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "../ripple/common/seconds_clock.h" +#include -#include "shamap/SHAMap.cpp" // Uses theApp -#include "shamap/SHAMapItem.cpp" -#include "shamap/SHAMapSync.cpp" -#include "shamap/SHAMapMissingNode.cpp" +#include // Uses theApp +#include +#include +#include -#include "misc/AccountItem.cpp" -#include "misc/CanonicalTXSet.cpp" -#include "ledger/LedgerProposal.cpp" -#include "main/LoadManager.cpp" -#include "misc/NicknameState.cpp" -#include "ledger/OrderBookDB.cpp" +#include +#include +#include +#include +#include +#include -#include "data/Database.cpp" -#include "data/DatabaseCon.cpp" -#include "data/SqliteDatabase.cpp" -#include "data/DBInit.cpp" +#include +#include +#include +#include -# include "shamap/RadixMapTest.h" -#include "shamap/RadixMapTest.cpp" -#include "shamap/FetchPackTests.cpp" +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt3.unity.cpp b/src/ripple_app/ripple_app_pt3.unity.cpp index a242251f25..1c9a0aca48 100644 --- a/src/ripple_app/ripple_app_pt3.unity.cpp +++ b/src/ripple_app/ripple_app_pt3.unity.cpp @@ -19,15 +19,15 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "ledger/Ledger.cpp" -#include "shamap/SHAMapDelta.cpp" -#include "shamap/SHAMapNode.cpp" -#include "shamap/SHAMapTreeNode.cpp" -#include "misc/AccountItems.cpp" -#include "misc/AccountState.cpp" -#include "contracts/Contract.cpp" -#include "contracts/Operation.cpp" -#include "contracts/ScriptData.cpp" -#include "contracts/Interpreter.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt4.unity.cpp b/src/ripple_app/ripple_app_pt4.unity.cpp index 0e39128d71..09867b069b 100644 --- a/src/ripple_app/ripple_app_pt4.unity.cpp +++ b/src/ripple_app/ripple_app_pt4.unity.cpp @@ -19,24 +19,24 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "../ripple_net/ripple_net.h" +#include -#include "../ripple/common/seconds_clock.h" +#include #include // for UniqueNodeList.cpp -#include "transactors/Transactor.h" +#include -#include "paths/RippleState.cpp" -#include "peers/UniqueNodeList.cpp" -#include "ledger/InboundLedger.cpp" -#include "tx/TransactionCheck.cpp" -#include "tx/TransactionMaster.cpp" -#include "tx/Transaction.cpp" -#include "tx/TransactionEngine.cpp" -#include "tx/TransactionMeta.cpp" +#include +#include +#include +#include +#include +#include +#include +#include -#include "book/tests/OfferStream.test.cpp" -#include "book/tests/Quality.test.cpp" +#include +#include diff --git a/src/ripple_app/ripple_app_pt5.unity.cpp b/src/ripple_app/ripple_app_pt5.unity.cpp index 3728d89fe7..d4e4a1c184 100644 --- a/src/ripple_app/ripple_app_pt5.unity.cpp +++ b/src/ripple_app/ripple_app_pt5.unity.cpp @@ -19,22 +19,22 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" -#include "../ripple_net/ripple_net.h" -#include "../ripple/common/jsonrpc_fields.h" +#include +#include +#include -#include "../ripple/common/seconds_clock.h" -#include "../ripple/peerfinder/ripple_peerfinder.h" -#include "../ripple/resource/ripple_resource.h" -#include "../ripple/validators/ripple_validators.h" -#include "../ripple/common/RippleSSLContext.h" +#include +#include +#include +#include +#include #include -#include "misc/ProofOfWork.h" +#include -#include "ledger/LedgerTiming.cpp" -#include "ledger/AcceptedLedgerTx.cpp" -#include "main/LocalCredentials.cpp" -#include "misc/Validations.cpp" -#include "misc/FeeVoteImpl.cpp" +#include +#include +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt6.unity.cpp b/src/ripple_app/ripple_app_pt6.unity.cpp index aa93928eb3..a38de9f963 100644 --- a/src/ripple_app/ripple_app_pt6.unity.cpp +++ b/src/ripple_app/ripple_app_pt6.unity.cpp @@ -19,16 +19,16 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "../ripple/common/seconds_clock.h" +#include -#include "ledger/LedgerEntrySet.cpp" -#include "ledger/AcceptedLedger.cpp" -#include "ledger/DirectoryEntryIterator.cpp" -#include "ledger/OrderBookIterator.cpp" -#include "consensus/DisputedTx.cpp" -#include "misc/HashRouter.cpp" -#include "misc/Offer.cpp" -#include "paths/Pathfinder.cpp" -#include "misc/AmendmentTableImpl.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt7.unity.cpp b/src/ripple_app/ripple_app_pt7.unity.cpp index 97e9560e94..e76c66af7f 100644 --- a/src/ripple_app/ripple_app_pt7.unity.cpp +++ b/src/ripple_app/ripple_app_pt7.unity.cpp @@ -19,18 +19,18 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "../ripple/resource/ripple_resource.h" +#include -#include "../ripple/common/seconds_clock.h" +#include -#include "ledger/InboundLedgers.cpp" -#include "ledger/LedgerHistory.cpp" -#include "misc/SerializedLedger.cpp" -#include "tx/TransactionAcquire.cpp" +#include +#include +#include +#include -# include "tx/TxQueueEntry.h" -# include "tx/TxQueue.h" -# include "tx/LocalTxs.cpp" -#include "misc/NetworkOPs.cpp" +#include +#include +#include +#include diff --git a/src/ripple_app/ripple_app_pt8.unity.cpp b/src/ripple_app/ripple_app_pt8.unity.cpp index 89f05a4e73..6633c6920c 100644 --- a/src/ripple_app/ripple_app_pt8.unity.cpp +++ b/src/ripple_app/ripple_app_pt8.unity.cpp @@ -19,23 +19,23 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include #ifdef _MSC_VER #pragma warning (push) #pragma warning (disable: 4309) // truncation of constant value #endif -#include "../ripple_rpc/api/ErrorCodes.h" +#include -#include "paths/PathRequest.cpp" -#include "paths/PathRequests.cpp" -#include "paths/RippleCalc.cpp" -#include "paths/PathState.cpp" +#include +#include +#include +#include -#include "main/ParameterTable.cpp" -#include "paths/RippleLineCache.cpp" -#include "ledger/SerializedValidation.cpp" +#include +#include +#include #ifdef _MSC_VER #pragma warning (pop) diff --git a/src/ripple_app/ripple_app_pt9.unity.cpp b/src/ripple_app/ripple_app_pt9.unity.cpp index bbc1845cc8..b41d2737e2 100644 --- a/src/ripple_app/ripple_app_pt9.unity.cpp +++ b/src/ripple_app/ripple_app_pt9.unity.cpp @@ -19,26 +19,26 @@ #include "../../BeastConfig.h" -#include "ripple_app.h" +#include -#include "book/impl/Taker.cpp" -#include "book/impl/BookTip.cpp" -#include "book/impl/OfferStream.cpp" -#include "book/impl/Quality.cpp" +#include +#include +#include +#include -#include "transactors/Transactor.cpp" +#include -#include "transactors/Change.cpp" -#include "transactors/CancelOffer.cpp" -#include "transactors/Payment.cpp" -#include "transactors/SetRegularKey.cpp" -#include "transactors/SetAccount.cpp" -#include "transactors/AddWallet.cpp" -#include "transactors/SetTrust.cpp" -#include "transactors/CreateOffer.cpp" -#include "transactors/CreateOfferDirect.cpp" -#include "transactors/CreateOfferBridged.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if RIPPLE_USE_OLD_CREATE_TRANSACTOR -#include "transactors/CreateOfferLegacy.cpp" +#include #endif diff --git a/src/ripple_app/rpc/RPCHandler.cpp b/src/ripple_app/rpc/RPCHandler.cpp index 2c25db3deb..5bdad097be 100644 --- a/src/ripple_app/rpc/RPCHandler.cpp +++ b/src/ripple_app/rpc/RPCHandler.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_rpc/impl/Handlers.cpp" +#include namespace ripple { diff --git a/src/ripple_app/rpc/RPCHandler.h b/src/ripple_app/rpc/RPCHandler.h index 8b0d8db569..a690c2705f 100644 --- a/src/ripple_app/rpc/RPCHandler.h +++ b/src/ripple_app/rpc/RPCHandler.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_APP_RPC_HANDLER #define RIPPLE_APP_RPC_HANDLER -#include "../../ripple_rpc/impl/AccountFromString.h" -#include "../../ripple_rpc/impl/Accounts.h" -#include "../../ripple_rpc/impl/Authorize.h" -#include "../../ripple_rpc/impl/GetMasterGenerator.h" -#include "../../ripple_rpc/impl/LookupLedger.h" -#include "../../ripple_rpc/impl/ParseAccountIds.h" -#include "../../ripple_rpc/impl/TransactionSign.h" +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/shamap/FetchPackTests.cpp b/src/ripple_app/shamap/FetchPackTests.cpp index d37125799f..ebea80bdaf 100644 --- a/src/ripple_app/shamap/FetchPackTests.cpp +++ b/src/ripple_app/shamap/FetchPackTests.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include #include diff --git a/src/ripple_app/shamap/RadixMapTest.h b/src/ripple_app/shamap/RadixMapTest.h index e0f4ff4033..947f2a40b5 100644 --- a/src/ripple_app/shamap/RadixMapTest.h +++ b/src/ripple_app/shamap/RadixMapTest.h @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/maths/Random.h" +#include namespace ripple { namespace RadixMap { diff --git a/src/ripple_app/shamap/SHAMap.cpp b/src/ripple_app/shamap/SHAMap.cpp index 9612072bce..197458ae0f 100644 --- a/src/ripple_app/shamap/SHAMap.cpp +++ b/src/ripple_app/shamap/SHAMap.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_app/shamap/SHAMap.h b/src/ripple_app/shamap/SHAMap.h index fba3b45d43..2e068bbaa0 100644 --- a/src/ripple_app/shamap/SHAMap.h +++ b/src/ripple_app/shamap/SHAMap.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_SHAMAP_H #define RIPPLE_SHAMAP_H -#include "../main/FullBelowCache.h" +#include -#include "../../ripple/radmap/ripple_radmap.h" +#include #include diff --git a/src/ripple_app/shamap/SHAMapAddNode.h b/src/ripple_app/shamap/SHAMapAddNode.h index 0610beff6d..a99d9aa61d 100644 --- a/src/ripple_app/shamap/SHAMapAddNode.h +++ b/src/ripple_app/shamap/SHAMapAddNode.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SHAMAPADDNODE_H #define RIPPLE_SHAMAPADDNODE_H -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include namespace ripple { diff --git a/src/ripple_app/shamap/SHAMapSync.cpp b/src/ripple_app/shamap/SHAMapSync.cpp index 6770ac4b6b..35109b9612 100644 --- a/src/ripple_app/shamap/SHAMapSync.cpp +++ b/src/ripple_app/shamap/SHAMapSync.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_app/transactors/CreateOffer.cpp b/src/ripple_app/transactors/CreateOffer.cpp index 661222ce44..299cdebb2a 100644 --- a/src/ripple_app/transactors/CreateOffer.cpp +++ b/src/ripple_app/transactors/CreateOffer.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include "CreateOfferDirect.h" -#include "CreateOfferBridged.h" +#include +#include #if RIPPLE_USE_OLD_CREATE_TRANSACTOR -#include "CreateOfferLegacy.h" +#include #endif -#include "../book/OfferStream.h" -#include "../book/Taker.h" -#include "../book/Types.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/transactors/CreateOffer.h b/src/ripple_app/transactors/CreateOffer.h index 4353adcf2e..9d294db428 100644 --- a/src/ripple_app/transactors/CreateOffer.h +++ b/src/ripple_app/transactors/CreateOffer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TX_OFFERCREATE_H_INCLUDED #define RIPPLE_TX_OFFERCREATE_H_INCLUDED -#include "../book/Amounts.h" -#include "../book/Types.h" +#include +#include -#include "../../beast/beast/cxx14/memory.h" +#include namespace ripple { diff --git a/src/ripple_app/transactors/CreateOfferBridged.cpp b/src/ripple_app/transactors/CreateOfferBridged.cpp index e773a0b9df..df1dfb62a2 100644 --- a/src/ripple_app/transactors/CreateOfferBridged.cpp +++ b/src/ripple_app/transactors/CreateOfferBridged.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include "../book/OfferStream.h" -#include "../book/Taker.h" -#include "../book/Quality.h" -#include "../../beast/beast/streams/debug_ostream.h" +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/transactors/CreateOfferBridged.h b/src/ripple_app/transactors/CreateOfferBridged.h index d8c75a45c3..283574bf7c 100644 --- a/src/ripple_app/transactors/CreateOfferBridged.h +++ b/src/ripple_app/transactors/CreateOfferBridged.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_BRIDGE_OFFERCREATE_H_INCLUDED #define RIPPLE_TX_BRIDGE_OFFERCREATE_H_INCLUDED -#include "../book/Amounts.h" +#include #include diff --git a/src/ripple_app/transactors/CreateOfferDirect.cpp b/src/ripple_app/transactors/CreateOfferDirect.cpp index 32053da0b0..b4a8bb512f 100644 --- a/src/ripple_app/transactors/CreateOfferDirect.cpp +++ b/src/ripple_app/transactors/CreateOfferDirect.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../book/OfferStream.h" -#include "../book/Taker.h" -#include "../../beast/beast/streams/debug_ostream.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/transactors/CreateOfferDirect.h b/src/ripple_app/transactors/CreateOfferDirect.h index ae00a86ea2..db90137524 100644 --- a/src/ripple_app/transactors/CreateOfferDirect.h +++ b/src/ripple_app/transactors/CreateOfferDirect.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TX_DIRECT_OFFERCREATE_H_INCLUDED #define RIPPLE_TX_DIRECT_OFFERCREATE_H_INCLUDED -#include "../book/Amounts.h" +#include #include diff --git a/src/ripple_app/transactors/Transactor.cpp b/src/ripple_app/transactors/Transactor.cpp index 840d1652b5..e24065cb01 100644 --- a/src/ripple_app/transactors/Transactor.cpp +++ b/src/ripple_app/transactors/Transactor.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include "Transactor.h" -#include "AddWallet.h" -#include "CancelOffer.h" -#include "Change.h" -#include "CreateOffer.h" -#include "Payment.h" -#include "SetAccount.h" -#include "SetRegularKey.h" -#include "SetTrust.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_app/tx/TransactionAcquire.cpp b/src/ripple_app/tx/TransactionAcquire.cpp index 849d777b08..cf23feaee6 100644 --- a/src/ripple_app/tx/TransactionAcquire.cpp +++ b/src/ripple_app/tx/TransactionAcquire.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_overlay/api/Overlay.h" +#include namespace ripple { diff --git a/src/ripple_app/websocket/WSDoor.cpp b/src/ripple_app/websocket/WSDoor.cpp index 2ef5bdd489..c05f971565 100644 --- a/src/ripple_app/websocket/WSDoor.cpp +++ b/src/ripple_app/websocket/WSDoor.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/cxx14/memory.h" // +#include // namespace ripple { diff --git a/src/ripple_basics/containers/RangeSet.cpp b/src/ripple_basics/containers/RangeSet.cpp index 163b20eb10..042aa7efa2 100644 --- a/src/ripple_basics/containers/RangeSet.cpp +++ b/src/ripple_basics/containers/RangeSet.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include +#include namespace ripple { diff --git a/src/ripple_basics/containers/SyncUnorderedMap.h b/src/ripple_basics/containers/SyncUnorderedMap.h index 5fdfa0b672..74ad4c3fb3 100644 --- a/src/ripple_basics/containers/SyncUnorderedMap.h +++ b/src/ripple_basics/containers/SyncUnorderedMap.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SYNC_UNORDERED_MAP_H #define RIPPLE_SYNC_UNORDERED_MAP_H -#include "../../ripple/common/UnorderedContainers.h" +#include namespace ripple { diff --git a/src/ripple_basics/log/LogFile.cpp b/src/ripple_basics/log/LogFile.cpp index bc9beca224..2062083e73 100644 --- a/src/ripple_basics/log/LogFile.cpp +++ b/src/ripple_basics/log/LogFile.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/cxx14/memory.h" // +#include // namespace ripple { diff --git a/src/ripple_basics/log/LogSink.cpp b/src/ripple_basics/log/LogSink.cpp index dbf56a22ff..fb11dc1a52 100644 --- a/src/ripple_basics/log/LogSink.cpp +++ b/src/ripple_basics/log/LogSink.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/logging/Logger.h" +#include namespace ripple { diff --git a/src/ripple_basics/log/LogSink.h b/src/ripple_basics/log/LogSink.h index b050eaf11c..71d107c155 100644 --- a/src/ripple_basics/log/LogSink.h +++ b/src/ripple_basics/log/LogSink.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_BASICS_LOGSINK_H_INCLUDED #define RIPPLE_BASICS_LOGSINK_H_INCLUDED -#include "../../beast/beast/smart_ptr/SharedPtr.h" -#include "../../beast/modules/beast_core/memory/SharedSingleton.h" +#include +#include namespace ripple { diff --git a/src/ripple_basics/log/LoggedTimings.h b/src/ripple_basics/log/LoggedTimings.h index 644cd000c1..a2b058333a 100644 --- a/src/ripple_basics/log/LoggedTimings.h +++ b/src/ripple_basics/log/LoggedTimings.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_BASICS_LOGGEDTIMINGS_H_INCLUDED #define RIPPLE_BASICS_LOGGEDTIMINGS_H_INCLUDED -#include "../../beast/modules/beast_core/time/Time.h" -#include "../../beast/modules/beast_core/diagnostic/MeasureFunctionCallTime.h" -#include "../../beast/beast/utility/Debug.h" -#include "../containers/SyncUnorderedMap.h" +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_basics/ripple_basics.h b/src/ripple_basics/ripple_basics.h index f50a680458..2619ac9850 100644 --- a/src/ripple_basics/ripple_basics.h +++ b/src/ripple_basics/ripple_basics.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_BASICS_H_INCLUDED #define RIPPLE_BASICS_H_INCLUDED -#include "../beast/beast/Crypto.h" +#include -#include "../beast/modules/beast_core/system/BeforeBoost.h" -#include "system/BoostIncludes.h" +#include +#include #include -#include "../../beast/beast/cxx14/memory.h" -#include "../../beast/beast/utility/Zero.h" +#include +#include using beast::zero; using beast::Zero; @@ -38,27 +38,27 @@ using beast::Zero; //------------------------------------------------------------------------------ -#include "../ripple/types/ripple_types.h" +#include -#include "types/BasicTypes.h" +#include -# include "log/LogSeverity.h" -# include "log/LogFile.h" -# include "log/LogSink.h" -# include "log/LogPartition.h" -# include "log/Log.h" -#include "log/LoggedTimings.h" +#include +#include +#include +#include +#include +#include -#include "utility/CountedObject.h" -#include "utility/IniFile.h" -#include "utility/PlatformMacros.h" -#include "utility/StringUtilities.h" -#include "utility/Sustain.h" -#include "utility/ThreadName.h" -#include "utility/Time.h" -#include "utility/UptimeTimer.h" +#include +#include +#include +#include +#include +#include +#include +#include -#include "containers/RangeSet.h" -#include "containers/SyncUnorderedMap.h" +#include +#include #endif diff --git a/src/ripple_basics/ripple_basics.unity.cpp b/src/ripple_basics/ripple_basics.unity.cpp index 660cf58e2c..60e2767269 100644 --- a/src/ripple_basics/ripple_basics.unity.cpp +++ b/src/ripple_basics/ripple_basics.unity.cpp @@ -19,9 +19,9 @@ #include "../../BeastConfig.h" -#include "ripple_basics.h" +#include -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include // For StringUtilities.cpp #include // for Log files @@ -43,18 +43,18 @@ //------------------------------------------------------------------------------ -#include "containers/RangeSet.cpp" -#include "system/CheckLibraryVersions.cpp" +#include +#include -#include "log/Log.cpp" -#include "log/LogFile.cpp" -#include "log/LogPartition.cpp" -#include "log/LogSink.cpp" +#include +#include +#include +#include -#include "utility/CountedObject.cpp" -#include "utility/IniFile.cpp" -#include "utility/StringUtilities.cpp" -#include "utility/Sustain.cpp" -#include "utility/ThreadName.cpp" -#include "utility/Time.cpp" -#include "utility/UptimeTimer.cpp" +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple_basics/system/BoostIncludes.h b/src/ripple_basics/system/BoostIncludes.h index ea4dedc6b6..be7d8fc7f9 100644 --- a/src/ripple_basics/system/BoostIncludes.h +++ b/src/ripple_basics/system/BoostIncludes.h @@ -45,6 +45,6 @@ #include // work-around for broken -#include "../../beast/beast/boost/get_pointer.h" +#include #endif diff --git a/src/ripple_basics/system/CheckLibraryVersions.cpp b/src/ripple_basics/system/CheckLibraryVersions.cpp index 13814e032e..60fda8b25c 100644 --- a/src/ripple_basics/system/CheckLibraryVersions.cpp +++ b/src/ripple_basics/system/CheckLibraryVersions.cpp @@ -20,12 +20,12 @@ #include #include -#include "../../beast/beast/unit_test/suite.h" -#include "../../beast/modules/beast_core/diagnostic/SemanticVersion.h" +#include +#include #include #include -#include "CheckLibraryVersions.h" +#include namespace ripple { namespace version { diff --git a/src/ripple_basics/utility/CountedObject.h b/src/ripple_basics/utility/CountedObject.h index e8afa84eb0..8a816c793a 100644 --- a/src/ripple_basics/utility/CountedObject.h +++ b/src/ripple_basics/utility/CountedObject.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_COUNTEDOBJECT_H_INCLUDED #define RIPPLE_COUNTEDOBJECT_H_INCLUDED -#include "../../beast/beast/utility/LeakChecked.h" +#include namespace ripple { diff --git a/src/ripple_basics/utility/IniFile.h b/src/ripple_basics/utility/IniFile.h index 9d96fc251b..5e4c20c391 100644 --- a/src/ripple_basics/utility/IniFile.h +++ b/src/ripple_basics/utility/IniFile.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_INIFILE_H_INCLUDED #define RIPPLE_INIFILE_H_INCLUDED -#include "../../beast/modules/beast_core/text/StringPairArray.h" +#include namespace ripple { diff --git a/src/ripple_basics/utility/PlatformMacros.h b/src/ripple_basics/utility/PlatformMacros.h index 2c164a6ca0..dc0bf19891 100644 --- a/src/ripple_basics/utility/PlatformMacros.h +++ b/src/ripple_basics/utility/PlatformMacros.h @@ -21,7 +21,7 @@ #define RIPPLE_PLATFORMMACROS_H #include -#include "../../beast/beast/cxx14/type_traits.h" // +#include // namespace ripple { diff --git a/src/ripple_basics/utility/StringUtilities.cpp b/src/ripple_basics/utility/StringUtilities.cpp index 3138af1651..f8bce08889 100644 --- a/src/ripple_basics/utility/StringUtilities.cpp +++ b/src/ripple_basics/utility/StringUtilities.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include #include diff --git a/src/ripple_core/functional/Config.cpp b/src/ripple_core/functional/Config.cpp index 2dc4d3e8d0..d965cb3c9d 100644 --- a/src/ripple_core/functional/Config.cpp +++ b/src/ripple_core/functional/Config.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/Config.h b/src/ripple_core/functional/Config.h index fb8e16fb83..92f9c6f0b9 100644 --- a/src/ripple_core/functional/Config.h +++ b/src/ripple_core/functional/Config.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_CONFIG_H_INCLUDED #define RIPPLE_CORE_CONFIG_H_INCLUDED -#include "../../beast/modules/beast_core/files/File.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/JobQueue.cpp b/src/ripple_core/functional/JobQueue.cpp index 3d6dbc3c45..883450805b 100644 --- a/src/ripple_core/functional/JobQueue.cpp +++ b/src/ripple_core/functional/JobQueue.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include "JobQueue.h" -#include "JobTypes.h" -#include "JobTypeInfo.h" -#include "JobTypeData.h" +#include +#include +#include +#include -#include "../../beast/beast/cxx14/memory.h" -#include "../../beast/beast/chrono/chrono_util.h" -#include "../../beast/modules/beast_core/thread/Workers.h" -#include "../../beast/modules/beast_core/system/SystemStats.h" +#include +#include +#include +#include #include diff --git a/src/ripple_core/functional/JobQueue.h b/src/ripple_core/functional/JobQueue.h index 1b22b617ae..36c88f912a 100644 --- a/src/ripple_core/functional/JobQueue.h +++ b/src/ripple_core/functional/JobQueue.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_JOBQUEUE_H_INCLUDED #define RIPPLE_CORE_JOBQUEUE_H_INCLUDED -#include "../../beast/beast/threads/Stoppable.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/JobTypeData.h b/src/ripple_core/functional/JobTypeData.h index 8e18be058e..140803347e 100644 --- a/src/ripple_core/functional/JobTypeData.h +++ b/src/ripple_core/functional/JobTypeData.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED -#include "JobTypeInfo.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/JobTypes.h b/src/ripple_core/functional/JobTypes.h index dbe11bcab1..dee088db85 100644 --- a/src/ripple_core/functional/JobTypes.h +++ b/src/ripple_core/functional/JobTypes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#include "Job.h" -#include "JobTypeInfo.h" +#include +#include namespace ripple { diff --git a/src/ripple_core/functional/LoadEvent.h b/src/ripple_core/functional/LoadEvent.h index b5681c4da9..0f1609ef9c 100644 --- a/src/ripple_core/functional/LoadEvent.h +++ b/src/ripple_core/functional/LoadEvent.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_LOADEVENT_H #define RIPPLE_LOADEVENT_H -#include "../../beast/beast/chrono/RelativeTime.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/LoadFeeTrackImp.cpp b/src/ripple_core/functional/LoadFeeTrackImp.cpp index 026f0624b2..95d62906d1 100644 --- a/src/ripple_core/functional/LoadFeeTrackImp.cpp +++ b/src/ripple_core/functional/LoadFeeTrackImp.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_core/functional/LoadFeeTrackImp.h b/src/ripple_core/functional/LoadFeeTrackImp.h index 4c7efdd99d..feee28a695 100644 --- a/src/ripple_core/functional/LoadFeeTrackImp.h +++ b/src/ripple_core/functional/LoadFeeTrackImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_LOADFEETRACKIMP_H_INCLUDED #define RIPPLE_LOADFEETRACKIMP_H_INCLUDED -#include "../../ripple/common/jsonrpc_fields.h" +#include namespace ripple { diff --git a/src/ripple_core/nodestore/NodeStore.cpp b/src/ripple_core/nodestore/NodeStore.cpp index 0d70d95412..260c5827da 100644 --- a/src/ripple_core/nodestore/NodeStore.cpp +++ b/src/ripple_core/nodestore/NodeStore.cpp @@ -21,46 +21,46 @@ #include // backend support -#include "../../ripple_hyperleveldb/ripple_hyperleveldb.h" -#include "../../ripple_leveldb/ripple_leveldb.h" -#include "../../ripple/rocksdb/ripple_rocksdb.h" +#include +#include +#include -#include "../../beast/beast/cxx14/memory.h" +#include -#include "../../ripple/common/seconds_clock.h" -#include "../../ripple/common/TaggedCache.h" -#include "../../ripple/common/KeyCache.h" +#include +#include +#include -#include "impl/Tuning.h" -# include "impl/DecodedBlob.h" -# include "impl/EncodedBlob.h" -# include "impl/BatchWriter.h" -# include "backend/HyperDBFactory.h" -#include "backend/HyperDBFactory.cpp" -# include "backend/LevelDBFactory.h" -#include "backend/LevelDBFactory.cpp" -# include "backend/MemoryFactory.h" -#include "backend/MemoryFactory.cpp" -# include "backend/NullFactory.h" -#include "backend/NullFactory.cpp" -# include "backend/RocksDBFactory.h" -#include "backend/RocksDBFactory.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "impl/Backend.cpp" -#include "impl/BatchWriter.cpp" -# include "impl/DatabaseImp.h" -#include "impl/Database.cpp" -#include "impl/DummyScheduler.cpp" -#include "impl/DecodedBlob.cpp" -#include "impl/EncodedBlob.cpp" -#include "impl/Factory.cpp" -#include "impl/Manager.cpp" -#include "impl/NodeObject.cpp" -#include "impl/Scheduler.cpp" -#include "impl/Task.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -# include "tests/TestBase.h" -#include "tests/BackendTests.cpp" -#include "tests/BasicTests.cpp" -#include "tests/DatabaseTests.cpp" -#include "tests/TimingTests.cpp" +#include +#include +#include +#include +#include diff --git a/src/ripple_core/nodestore/NodeStore.h b/src/ripple_core/nodestore/NodeStore.h index 190087ca96..c58774d732 100644 --- a/src/ripple_core/nodestore/NodeStore.h +++ b/src/ripple_core/nodestore/NodeStore.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_NODESTORE_H_INCLUDED #define RIPPLE_NODESTORE_H_INCLUDED -#include "api/NodeObject.h" -#include "api/Types.h" -#include "api/VisitCallback.h" -#include "api/Backend.h" -# include "api/Task.h" -# include "api/Scheduler.h" -#include "api/DummyScheduler.h" -#include "api/Factory.h" -#include "api/Database.h" -#include "api/Manager.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/ripple_core/nodestore/backend/RocksDBFactory.cpp b/src/ripple_core/nodestore/backend/RocksDBFactory.cpp index 5578d76df2..84658f5624 100644 --- a/src/ripple_core/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple_core/nodestore/backend/RocksDBFactory.cpp @@ -1,367 +1,367 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - 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. -*/ -//============================================================================== - -#if RIPPLE_ROCKSDB_AVAILABLE - -#include "../../../beast/beast/threads/Thread.h" - -#include - -namespace ripple { -namespace NodeStore { - -class RocksDBEnv : public rocksdb::EnvWrapper -{ -public: - RocksDBEnv () - : EnvWrapper (rocksdb::Env::Default()) - { - } - - struct ThreadParams - { - ThreadParams (void (*f_)(void*), void* a_) - : f (f_) - , a (a_) - { - } - - void (*f)(void*); - void* a; - }; - - static - void - thread_entry (void* ptr) - { - ThreadParams* const p (reinterpret_cast (ptr)); - void (*f)(void*) = p->f; - void* a (p->a); - delete p; - - static std::atomic n; - std::size_t const id (++n); - std::stringstream ss; - ss << "rocksdb #" << id; - beast::Thread::setCurrentThreadName (ss.str()); - - (*f)(a); - } - - void - StartThread (void (*f)(void*), void* a) - { - ThreadParams* const p (new ThreadParams (f, a)); - EnvWrapper::StartThread (&RocksDBEnv::thread_entry, p); - } -}; - -//------------------------------------------------------------------------------ - -class RocksDBBackend - : public Backend - , public BatchWriter::Callback - , public beast::LeakChecked -{ -public: - beast::Journal m_journal; - size_t const m_keyBytes; - Scheduler& m_scheduler; - BatchWriter m_batch; - std::string m_name; - std::unique_ptr m_db; - - RocksDBBackend (int keyBytes, Parameters const& keyValues, - Scheduler& scheduler, beast::Journal journal, RocksDBEnv* env) - : m_journal (journal) - , m_keyBytes (keyBytes) - , m_scheduler (scheduler) - , m_batch (*this, scheduler) - , m_name (keyValues ["path"].toStdString ()) - { - if (m_name.empty()) - throw std::runtime_error ("Missing path in RocksDBFactory backend"); - - rocksdb::Options options; - options.create_if_missing = true; - options.env = env; - - if (keyValues["cache_mb"].isEmpty()) - { - options.block_cache = rocksdb::NewLRUCache (getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024); - } - else - { - options.block_cache = rocksdb::NewLRUCache (keyValues["cache_mb"].getIntValue() * 1024L * 1024L); - } - - if (keyValues["filter_bits"].isEmpty()) - { - if (getConfig ().NODE_SIZE >= 2) - options.filter_policy = rocksdb::NewBloomFilterPolicy (10); - } - else if (keyValues["filter_bits"].getIntValue() != 0) - { - options.filter_policy = rocksdb::NewBloomFilterPolicy (keyValues["filter_bits"].getIntValue()); - } - - if (! keyValues["open_files"].isEmpty()) - { - options.max_open_files = keyValues["open_files"].getIntValue(); - } - - if (! keyValues["file_size_mb"].isEmpty()) - { - options.target_file_size_base = 1024 * 1024 * keyValues["file_size_mb"].getIntValue(); - options.max_bytes_for_level_base = 5 * options.target_file_size_base; - options.write_buffer_size = 2 * options.target_file_size_base; - } - - if (! keyValues["file_size_mult"].isEmpty()) - { - options.target_file_size_multiplier = keyValues["file_size_mult"].getIntValue(); - } - - if (! keyValues["bg_threads"].isEmpty()) - { - options.env->SetBackgroundThreads - (keyValues["bg_threads"].getIntValue(), rocksdb::Env::LOW); - } - - if (! keyValues["high_threads"].isEmpty()) - { - auto const highThreads = keyValues["high_threads"].getIntValue(); - options.env->SetBackgroundThreads (highThreads, rocksdb::Env::HIGH); - - // If we have high-priority threads, presumably we want to - // use them for background flushes - if (highThreads > 0) - options.max_background_flushes = highThreads; - } - +//------------------------------------------------------------------------------ +/* + This file is part of rippled: https://github.com/ripple/rippled + Copyright (c) 2012, 2013 Ripple Labs Inc. + + 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. +*/ +//============================================================================== + +#if RIPPLE_ROCKSDB_AVAILABLE + +#include + +#include + +namespace ripple { +namespace NodeStore { + +class RocksDBEnv : public rocksdb::EnvWrapper +{ +public: + RocksDBEnv () + : EnvWrapper (rocksdb::Env::Default()) + { + } + + struct ThreadParams + { + ThreadParams (void (*f_)(void*), void* a_) + : f (f_) + , a (a_) + { + } + + void (*f)(void*); + void* a; + }; + + static + void + thread_entry (void* ptr) + { + ThreadParams* const p (reinterpret_cast (ptr)); + void (*f)(void*) = p->f; + void* a (p->a); + delete p; + + static std::atomic n; + std::size_t const id (++n); + std::stringstream ss; + ss << "rocksdb #" << id; + beast::Thread::setCurrentThreadName (ss.str()); + + (*f)(a); + } + + void + StartThread (void (*f)(void*), void* a) + { + ThreadParams* const p (new ThreadParams (f, a)); + EnvWrapper::StartThread (&RocksDBEnv::thread_entry, p); + } +}; + +//------------------------------------------------------------------------------ + +class RocksDBBackend + : public Backend + , public BatchWriter::Callback + , public beast::LeakChecked +{ +public: + beast::Journal m_journal; + size_t const m_keyBytes; + Scheduler& m_scheduler; + BatchWriter m_batch; + std::string m_name; + std::unique_ptr m_db; + + RocksDBBackend (int keyBytes, Parameters const& keyValues, + Scheduler& scheduler, beast::Journal journal, RocksDBEnv* env) + : m_journal (journal) + , m_keyBytes (keyBytes) + , m_scheduler (scheduler) + , m_batch (*this, scheduler) + , m_name (keyValues ["path"].toStdString ()) + { + if (m_name.empty()) + throw std::runtime_error ("Missing path in RocksDBFactory backend"); + + rocksdb::Options options; + options.create_if_missing = true; + options.env = env; + + if (keyValues["cache_mb"].isEmpty()) + { + options.block_cache = rocksdb::NewLRUCache (getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024); + } + else + { + options.block_cache = rocksdb::NewLRUCache (keyValues["cache_mb"].getIntValue() * 1024L * 1024L); + } + + if (keyValues["filter_bits"].isEmpty()) + { + if (getConfig ().NODE_SIZE >= 2) + options.filter_policy = rocksdb::NewBloomFilterPolicy (10); + } + else if (keyValues["filter_bits"].getIntValue() != 0) + { + options.filter_policy = rocksdb::NewBloomFilterPolicy (keyValues["filter_bits"].getIntValue()); + } + + if (! keyValues["open_files"].isEmpty()) + { + options.max_open_files = keyValues["open_files"].getIntValue(); + } + + if (! keyValues["file_size_mb"].isEmpty()) + { + options.target_file_size_base = 1024 * 1024 * keyValues["file_size_mb"].getIntValue(); + options.max_bytes_for_level_base = 5 * options.target_file_size_base; + options.write_buffer_size = 2 * options.target_file_size_base; + } + + if (! keyValues["file_size_mult"].isEmpty()) + { + options.target_file_size_multiplier = keyValues["file_size_mult"].getIntValue(); + } + + if (! keyValues["bg_threads"].isEmpty()) + { + options.env->SetBackgroundThreads + (keyValues["bg_threads"].getIntValue(), rocksdb::Env::LOW); + } + + if (! keyValues["high_threads"].isEmpty()) + { + auto const highThreads = keyValues["high_threads"].getIntValue(); + options.env->SetBackgroundThreads (highThreads, rocksdb::Env::HIGH); + + // If we have high-priority threads, presumably we want to + // use them for background flushes + if (highThreads > 0) + options.max_background_flushes = highThreads; + } + if (! keyValues["compression"].isEmpty ()) { if (keyValues["compression"].getIntValue () == 0) { options.compression = rocksdb::kNoCompression; } - } - - rocksdb::DB* db = nullptr; - rocksdb::Status status = rocksdb::DB::Open (options, m_name, &db); - if (!status.ok () || !db) - throw std::runtime_error (std::string("Unable to open/create RocksDB: ") + status.ToString()); - - m_db.reset (db); - } - - ~RocksDBBackend () - { - } - - std::string - getName() - { - return m_name; - } - - //-------------------------------------------------------------------------- - - Status - fetch (void const* key, NodeObject::Ptr* pObject) - { - pObject->reset (); - - Status status (ok); - - rocksdb::ReadOptions const options; - rocksdb::Slice const slice (static_cast (key), m_keyBytes); - - std::string string; - - rocksdb::Status getStatus = m_db->Get (options, slice, &string); - - if (getStatus.ok ()) - { - DecodedBlob decoded (key, string.data (), string.size ()); - - if (decoded.wasOk ()) - { - *pObject = decoded.createObject (); - } - else - { - // Decoding failed, probably corrupted! - // - status = dataCorrupt; - } - } - else - { - if (getStatus.IsCorruption ()) - { - status = dataCorrupt; - } - else if (getStatus.IsNotFound ()) - { - status = notFound; - } - else - { - status = Status (customCode + getStatus.code()); - - m_journal.error << getStatus.ToString (); - } - } - - return status; - } - - void - store (NodeObject::ref object) - { - m_batch.store (object); - } - - void - storeBatch (Batch const& batch) - { - rocksdb::WriteBatch wb; - - EncodedBlob encoded; - - for (auto const& e : batch) - { - encoded.prepare (e); - - wb.Put ( - rocksdb::Slice (reinterpret_cast ( - encoded.getKey ()), m_keyBytes), - rocksdb::Slice (reinterpret_cast ( - encoded.getData ()), encoded.getSize ())); - } - - rocksdb::WriteOptions const options; - - m_db->Write (options, &wb).ok (); - } - - void - for_each (std::function f) - { - rocksdb::ReadOptions const options; - - std::unique_ptr it (m_db->NewIterator (options)); - - for (it->SeekToFirst (); it->Valid (); it->Next ()) - { - if (it->key ().size () == m_keyBytes) - { - DecodedBlob decoded (it->key ().data (), - it->value ().data (), - it->value ().size ()); - - if (decoded.wasOk ()) - { - f (decoded.createObject ()); - } - else - { - // Uh oh, corrupted data! - if (m_journal.fatal) m_journal.fatal << - "Corrupt NodeObject #" << uint256 (it->key ().data ()); - } - } - else - { - // VFALCO NOTE What does it mean to find an - // incorrectly sized key? Corruption? - if (m_journal.fatal) m_journal.fatal << - "Bad key size = " << it->key ().size (); - } - } - } - - int - getWriteLoad () - { - return m_batch.getWriteLoad (); - } - - //-------------------------------------------------------------------------- - - void - writeBatch (Batch const& batch) - { - storeBatch (batch); - } -}; - -//------------------------------------------------------------------------------ - -class RocksDBFactory : public Factory -{ -public: - std::shared_ptr m_lruCache; - RocksDBEnv m_env; - - RocksDBFactory () - { - rocksdb::Options options; - options.create_if_missing = true; - options.block_cache = rocksdb::NewLRUCache ( - getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024); - - m_lruCache = options.block_cache; - } - - ~RocksDBFactory () - { - } - - beast::String - getName () const - { - return "RocksDB"; - } - - std::unique_ptr - createInstance ( - size_t keyBytes, - Parameters const& keyValues, - Scheduler& scheduler, - beast::Journal journal) - { - return std::make_unique ( - keyBytes, keyValues, scheduler, journal, &m_env); - } -}; - -//------------------------------------------------------------------------------ - -std::unique_ptr -make_RocksDBFactory () -{ - return std::make_unique (); -} - -} -} - -#endif + } + + rocksdb::DB* db = nullptr; + rocksdb::Status status = rocksdb::DB::Open (options, m_name, &db); + if (!status.ok () || !db) + throw std::runtime_error (std::string("Unable to open/create RocksDB: ") + status.ToString()); + + m_db.reset (db); + } + + ~RocksDBBackend () + { + } + + std::string + getName() + { + return m_name; + } + + //-------------------------------------------------------------------------- + + Status + fetch (void const* key, NodeObject::Ptr* pObject) + { + pObject->reset (); + + Status status (ok); + + rocksdb::ReadOptions const options; + rocksdb::Slice const slice (static_cast (key), m_keyBytes); + + std::string string; + + rocksdb::Status getStatus = m_db->Get (options, slice, &string); + + if (getStatus.ok ()) + { + DecodedBlob decoded (key, string.data (), string.size ()); + + if (decoded.wasOk ()) + { + *pObject = decoded.createObject (); + } + else + { + // Decoding failed, probably corrupted! + // + status = dataCorrupt; + } + } + else + { + if (getStatus.IsCorruption ()) + { + status = dataCorrupt; + } + else if (getStatus.IsNotFound ()) + { + status = notFound; + } + else + { + status = Status (customCode + getStatus.code()); + + m_journal.error << getStatus.ToString (); + } + } + + return status; + } + + void + store (NodeObject::ref object) + { + m_batch.store (object); + } + + void + storeBatch (Batch const& batch) + { + rocksdb::WriteBatch wb; + + EncodedBlob encoded; + + for (auto const& e : batch) + { + encoded.prepare (e); + + wb.Put ( + rocksdb::Slice (reinterpret_cast ( + encoded.getKey ()), m_keyBytes), + rocksdb::Slice (reinterpret_cast ( + encoded.getData ()), encoded.getSize ())); + } + + rocksdb::WriteOptions const options; + + m_db->Write (options, &wb).ok (); + } + + void + for_each (std::function f) + { + rocksdb::ReadOptions const options; + + std::unique_ptr it (m_db->NewIterator (options)); + + for (it->SeekToFirst (); it->Valid (); it->Next ()) + { + if (it->key ().size () == m_keyBytes) + { + DecodedBlob decoded (it->key ().data (), + it->value ().data (), + it->value ().size ()); + + if (decoded.wasOk ()) + { + f (decoded.createObject ()); + } + else + { + // Uh oh, corrupted data! + if (m_journal.fatal) m_journal.fatal << + "Corrupt NodeObject #" << uint256 (it->key ().data ()); + } + } + else + { + // VFALCO NOTE What does it mean to find an + // incorrectly sized key? Corruption? + if (m_journal.fatal) m_journal.fatal << + "Bad key size = " << it->key ().size (); + } + } + } + + int + getWriteLoad () + { + return m_batch.getWriteLoad (); + } + + //-------------------------------------------------------------------------- + + void + writeBatch (Batch const& batch) + { + storeBatch (batch); + } +}; + +//------------------------------------------------------------------------------ + +class RocksDBFactory : public Factory +{ +public: + std::shared_ptr m_lruCache; + RocksDBEnv m_env; + + RocksDBFactory () + { + rocksdb::Options options; + options.create_if_missing = true; + options.block_cache = rocksdb::NewLRUCache ( + getConfig ().getSize (siHashNodeDBCache) * 1024 * 1024); + + m_lruCache = options.block_cache; + } + + ~RocksDBFactory () + { + } + + beast::String + getName () const + { + return "RocksDB"; + } + + std::unique_ptr + createInstance ( + size_t keyBytes, + Parameters const& keyValues, + Scheduler& scheduler, + beast::Journal journal) + { + return std::make_unique ( + keyBytes, keyValues, scheduler, journal, &m_env); + } +}; + +//------------------------------------------------------------------------------ + +std::unique_ptr +make_RocksDBFactory () +{ + return std::make_unique (); +} + +} +} + +#endif diff --git a/src/ripple_core/nodestore/impl/DatabaseImp.h b/src/ripple_core/nodestore/impl/DatabaseImp.h index ec572f9d21..a9dae69e89 100644 --- a/src/ripple_core/nodestore/impl/DatabaseImp.h +++ b/src/ripple_core/nodestore/impl/DatabaseImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASEIMP_H_INCLUDED -#include "../../beast/beast/threads/Thread.h" +#include #include #include diff --git a/src/ripple_core/nodestore/tests/BackendTests.cpp b/src/ripple_core/nodestore/tests/BackendTests.cpp index c21c972e64..ac7fa19c6e 100644 --- a/src/ripple_core/nodestore/tests/BackendTests.cpp +++ b/src/ripple_core/nodestore/tests/BackendTests.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/diagnostic/UnitTestUtilities.h" +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple_core/nodestore/tests/TestBase.h b/src/ripple_core/nodestore/tests/TestBase.h index 9b798437f5..48610d0d2b 100644 --- a/src/ripple_core/nodestore/tests/TestBase.h +++ b/src/ripple_core/nodestore/tests/TestBase.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_TESTBASE_H_INCLUDED #define RIPPLE_NODESTORE_TESTBASE_H_INCLUDED -#include "../../../beast/beast/unit_test/suite.h" -#include "../../../beast/modules/beast_core/maths/Random.h" +#include +#include namespace ripple { namespace NodeStore { diff --git a/src/ripple_core/ripple_core.h b/src/ripple_core/ripple_core.h index b8f6f89fd0..d72be4e3c3 100644 --- a/src/ripple_core/ripple_core.h +++ b/src/ripple_core/ripple_core.h @@ -20,23 +20,23 @@ #ifndef RIPPLE_CORE_H_INCLUDED #define RIPPLE_CORE_H_INCLUDED -#include "../ripple_basics/ripple_basics.h" -#include "../ripple_data/ripple_data.h" +#include +#include -#include "../beast/beast/http/URL.h" // for Config -#include "../beast/beast/Insight.h" +#include // for Config +#include -#include "../ripple/resource/api/LegacyFees.h" +#include -#include "nodestore/NodeStore.h" +#include -# include "functional/ConfigSections.h" -#include "functional/Config.h" -#include "functional/LoadFeeTrack.h" -# include "functional/LoadEvent.h" -# include "functional/LoadMonitor.h" +#include +#include +#include +#include +#include -# include "functional/Job.h" -#include "functional/JobQueue.h" +#include +#include #endif diff --git a/src/ripple_core/ripple_core.unity.cpp b/src/ripple_core/ripple_core.unity.cpp index a954c91663..a6f15e6165 100644 --- a/src/ripple_core/ripple_core.unity.cpp +++ b/src/ripple_core/ripple_core.unity.cpp @@ -19,25 +19,25 @@ #include "../../BeastConfig.h" -#include "ripple_core.h" +#include #include #include #include -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include -#include "nodestore/NodeStore.cpp" -#include "../beast/beast/http/ParsedURL.h" -#include "../ripple_net/ripple_net.h" // for HTTPClient +#include +#include +#include // for HTTPClient -#include "functional/Config.cpp" -# include "functional/LoadFeeTrackImp.h" // private -#include "functional/LoadFeeTrackImp.cpp" -#include "functional/LoadEvent.cpp" -#include "functional/LoadMonitor.cpp" +#include +#include // private +#include +#include +#include -#include "functional/Job.cpp" -#include "functional/JobQueue.cpp" +#include +#include diff --git a/src/ripple_data/crypto/Base58Data.h b/src/ripple_data/crypto/Base58Data.h index 0e522e1415..20beb153fa 100644 --- a/src/ripple_data/crypto/Base58Data.h +++ b/src/ripple_data/crypto/Base58Data.h @@ -32,8 +32,8 @@ #ifndef RIPPLE_BASE58DATA_H #define RIPPLE_BASE58DATA_H -#include "../../ripple/types/api/Base58.h" -#include "../../ripple/types/api/base_uint.h" +#include +#include namespace ripple { diff --git a/src/ripple_data/crypto/CKey.cpp b/src/ripple_data/crypto/CKey.cpp index f3b731d751..265c3afb97 100644 --- a/src/ripple_data/crypto/CKey.cpp +++ b/src/ripple_data/crypto/CKey.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_data/protocol/BuildInfo.cpp b/src/ripple_data/protocol/BuildInfo.cpp index d099f52b48..749b65a0e6 100644 --- a/src/ripple_data/protocol/BuildInfo.cpp +++ b/src/ripple_data/protocol/BuildInfo.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" -#include "../../beast/modules/beast_core/diagnostic/FatalError.h" -#include "../../beast/modules/beast_core/diagnostic/SemanticVersion.h" +#include +#include +#include namespace ripple { diff --git a/src/ripple_data/protocol/FieldNames.cpp b/src/ripple_data/protocol/FieldNames.cpp index 864aab9a14..e50861ffd7 100644 --- a/src/ripple_data/protocol/FieldNames.cpp +++ b/src/ripple_data/protocol/FieldNames.cpp @@ -40,7 +40,7 @@ SField sfIndex (STI_HASH256, 258, "index"); #define FIELD(name, type, index) SField sf##name(FIELD_CODE(STI_##type, index), STI_##type, index, #name); #define TYPE(name, type, index) -#include "../protocol/SerializeDeclarations.h" +#include #undef FIELD #undef TYPE @@ -97,7 +97,7 @@ SField::ref SField::getField (int code) #define FIELD(name, type, index) #define TYPE(name, type, index) case STI_##type: -#include "../protocol/SerializeDeclarations.h" +#include #undef FIELD #undef TYPE diff --git a/src/ripple_data/protocol/FieldNames.h b/src/ripple_data/protocol/FieldNames.h index 858cb01e10..8f41368c3d 100644 --- a/src/ripple_data/protocol/FieldNames.h +++ b/src/ripple_data/protocol/FieldNames.h @@ -34,7 +34,7 @@ enum SerializedTypeID #define TYPE(name, field, value) STI_##field = value, #define FIELD(name, field, value) -#include "../protocol/SerializeDeclarations.h" +#include #undef TYPE #undef FIELD @@ -243,7 +243,7 @@ extern SField sfInvalid, sfGeneric, sfLedgerEntry, sfTransaction, sfValidation; #define FIELD(name, type, index) extern SField sf##name; #define TYPE(name, type, index) -#include "../protocol/SerializeDeclarations.h" +#include #undef FIELD #undef TYPE diff --git a/src/ripple_data/protocol/KnownFormats.h b/src/ripple_data/protocol/KnownFormats.h index 1113098b64..fca5c9dfa7 100644 --- a/src/ripple_data/protocol/KnownFormats.h +++ b/src/ripple_data/protocol/KnownFormats.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_KNOWNFORMATS_H_INCLUDED #define RIPPLE_KNOWNFORMATS_H_INCLUDED -#include "../../beast/beast/cxx14/memory.h" // +#include // namespace ripple { diff --git a/src/ripple_data/protocol/RippleAddress.cpp b/src/ripple_data/protocol/RippleAddress.cpp index 86b16e260b..b893568de6 100644 --- a/src/ripple_data/protocol/RippleAddress.cpp +++ b/src/ripple_data/protocol/RippleAddress.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_data/protocol/RippleAddress.h b/src/ripple_data/protocol/RippleAddress.h index e0c4b818ef..c6015f08c1 100644 --- a/src/ripple_data/protocol/RippleAddress.h +++ b/src/ripple_data/protocol/RippleAddress.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_RIPPLEADDRESS_H #define RIPPLE_RIPPLEADDRESS_H -#include "../crypto/Base58Data.h" +#include -#include "../../ripple/types/api/UInt160.h" -#include "../../ripple/types/api/RippleAccountID.h" -#include "../../ripple/types/api/RippleAccountPrivateKey.h" -#include "../../ripple/types/api/RippleAccountPublicKey.h" -#include "../../ripple/types/api/RipplePrivateKey.h" -#include "../../ripple/types/api/RipplePublicKey.h" -#include "../../ripple/types/api/RipplePublicKeyHash.h" -#include "../../ripple/sslutil/api/ECDSACanonical.h" +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple_data/protocol/STAmount.cpp b/src/ripple_data/protocol/STAmount.cpp index ad654c2b05..e7b2c28538 100644 --- a/src/ripple_data/protocol/STAmount.cpp +++ b/src/ripple_data/protocol/STAmount.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/cxx14/iterator.h" +#include namespace ripple { diff --git a/src/ripple_data/protocol/STParsedJSON.cpp b/src/ripple_data/protocol/STParsedJSON.cpp index 22826dd975..2737ef2465 100644 --- a/src/ripple_data/protocol/STParsedJSON.cpp +++ b/src/ripple_data/protocol/STParsedJSON.cpp @@ -19,7 +19,7 @@ #include -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include namespace ripple { diff --git a/src/ripple_data/protocol/Serializer.cpp b/src/ripple_data/protocol/Serializer.cpp index af435afcfa..7f6e109773 100644 --- a/src/ripple_data/protocol/Serializer.cpp +++ b/src/ripple_data/protocol/Serializer.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/unit_test/suite.h" +#include namespace ripple { diff --git a/src/ripple_data/protocol/Serializer.h b/src/ripple_data/protocol/Serializer.h index 4f6cb09c92..f91a246bf8 100644 --- a/src/ripple_data/protocol/Serializer.h +++ b/src/ripple_data/protocol/Serializer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SERIALIZER_H #define RIPPLE_SERIALIZER_H -#include "../../ripple/common/byte_view.h" +#include namespace ripple { diff --git a/src/ripple_data/ripple_data.h b/src/ripple_data/ripple_data.h index 34e55623f0..a9ae9d4fd9 100644 --- a/src/ripple_data/ripple_data.h +++ b/src/ripple_data/ripple_data.h @@ -20,34 +20,34 @@ #ifndef RIPPLE_DATA_H_INCLUDED #define RIPPLE_DATA_H_INCLUDED -#include "../ripple_basics/ripple_basics.h" -#include "../ripple/json/ripple_json.h" -#include "../ripple/sslutil/api/ECDSACanonical.h" +#include +#include +#include struct bignum_st; typedef struct bignum_st BIGNUM; -#include "crypto/Base58Data.h" -#include "crypto/RFC1751.h" -#include "protocol/BuildInfo.h" -#include "protocol/FieldNames.h" -#include "protocol/HashPrefix.h" -#include "protocol/Protocol.h" -#include "protocol/RippleAddress.h" -#include "protocol/RippleSystem.h" -#include "protocol/Serializer.h" // needs CKey -#include "protocol/TER.h" -#include "protocol/SerializedTypes.h" // needs Serializer, TER -#include "protocol/SerializedObjectTemplate.h" - #include "protocol/KnownFormats.h" - #include "protocol/LedgerFormats.h" // needs SOTemplate from SerializedObjectTemplate - #include "protocol/TxFormats.h" -#include "protocol/SerializedObject.h" -#include "protocol/TxFlags.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include // needs CKey +#include +#include // needs Serializer, TER +#include + #include + #include // needs SOTemplate from SerializedObjectTemplate + #include +#include +#include -#include "utility/UptimeTimerAdapter.h" +#include -#include "protocol/STParsedJSON.h" +#include //------------------------------------------------------------------------------ diff --git a/src/ripple_data/ripple_data.unity.cpp b/src/ripple_data/ripple_data.unity.cpp index e6183d967e..d6dc9a7a1c 100644 --- a/src/ripple_data/ripple_data.unity.cpp +++ b/src/ripple_data/ripple_data.unity.cpp @@ -19,11 +19,11 @@ #include "../../BeastConfig.h" -#include "ripple_data.h" +#include //#include -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -42,9 +42,9 @@ #include #include -#include "../ripple/sslutil/ripple_sslutil.h" -#include "../ripple_rpc/api/ErrorCodes.h" -#include "../ripple/common/jsonrpc_fields.h" +#include +#include +#include // VFALCO TODO fix these warnings! #if BEAST_MSVC @@ -56,36 +56,36 @@ #undef min #endif -#include "protocol/STParsedJSON.cpp" +#include -#include "crypto/CKey.h" // needs RippleAddress VFALCO TODO remove this dependency cycle -#include "crypto/RFC1751.h" +#include // needs RippleAddress VFALCO TODO remove this dependency cycle +#include -#include "crypto/CKey.cpp" -#include "crypto/CKeyDeterministic.cpp" -#include "crypto/CKeyECIES.cpp" -#include "crypto/Base58Data.cpp" -#include "crypto/RFC1751.cpp" +#include +#include +#include +#include +#include -#include "protocol/BuildInfo.cpp" -#include "protocol/FieldNames.cpp" -#include "protocol/HashPrefix.cpp" -#include "protocol/LedgerFormats.cpp" -#include "protocol/RippleAddress.cpp" -#include "protocol/SerializedTypes.cpp" -#include "protocol/Serializer.cpp" -#include "protocol/SerializedObjectTemplate.cpp" -#include "protocol/SerializedObject.cpp" -#include "protocol/TER.cpp" -#include "protocol/TxFormats.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // These are for STAmount static const std::uint64_t tenTo14 = 100000000000000ull; static const std::uint64_t tenTo14m1 = tenTo14 - 1; static const std::uint64_t tenTo17 = tenTo14 * 1000; static const std::uint64_t tenTo17m1 = tenTo17 - 1; -#include "protocol/STAmount.cpp" -#include "protocol/STAmountRound.cpp" +#include +#include #if BEAST_MSVC #pragma warning (pop) diff --git a/src/ripple_hyperleveldb/ripple_hyperleveldb.h b/src/ripple_hyperleveldb/ripple_hyperleveldb.h index 47258ab5fe..28be45195c 100644 --- a/src/ripple_hyperleveldb/ripple_hyperleveldb.h +++ b/src/ripple_hyperleveldb/ripple_hyperleveldb.h @@ -20,16 +20,16 @@ #ifndef RIPPLE_HYPERLEVELDB_H_INCLUDED #define RIPPLE_HYPERLEVELDB_H_INCLUDED -#include "../beast/beast/Config.h" +#include #if ! BEAST_WIN32 #define RIPPLE_HYPERLEVELDB_AVAILABLE 1 -#include "../hyperleveldb/hyperleveldb/cache.h" -#include "../hyperleveldb/hyperleveldb/filter_policy.h" -#include "../hyperleveldb/hyperleveldb/db.h" -#include "../hyperleveldb/hyperleveldb/write_batch.h" +#include +#include +#include +#include #else diff --git a/src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp b/src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp index 39e612a929..342769c976 100644 --- a/src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp +++ b/src/ripple_hyperleveldb/ripple_hyperleveldb.unity.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" -#include "ripple_hyperleveldb.h" +#include #if RIPPLE_HYPERLEVELDB_AVAILABLE @@ -56,54 +56,54 @@ #define NDEBUG #endif -#include "../hyperleveldb/db/builder.cc" -#include "../hyperleveldb/db/db_impl.cc" -#include "../hyperleveldb/db/db_iter.cc" -#include "../hyperleveldb/db/dbformat.cc" -#include "../hyperleveldb/db/filename.cc" -#include "../hyperleveldb/db/log_reader.cc" -#include "../hyperleveldb/db/log_writer.cc" -#include "../hyperleveldb/db/memtable.cc" -#include "../hyperleveldb/db/repair.cc" -#include "../hyperleveldb/db/replay_iterator.cc" -#include "../hyperleveldb/db/table_cache.cc" -#include "../hyperleveldb/db/version_edit.cc" -#include "../hyperleveldb/db/version_set.cc" -#include "../hyperleveldb/db/write_batch.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../hyperleveldb/table/block.cc" -#include "../hyperleveldb/table/block_builder.cc" -#include "../hyperleveldb/table/filter_block.cc" -#include "../hyperleveldb/table/format.cc" -#include "../hyperleveldb/table/iterator.cc" -#include "../hyperleveldb/table/merger.cc" -#include "../hyperleveldb/table/table.cc" -#include "../hyperleveldb/table/table_builder.cc" -#include "../hyperleveldb/table/two_level_iterator.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../hyperleveldb/util/arena.cc" -#include "../hyperleveldb/util/bloom.cc" -#include "../hyperleveldb/util/cache.cc" -#include "../hyperleveldb/util/coding.cc" -#include "../hyperleveldb/util/comparator.cc" -#include "../hyperleveldb/util/crc32c.cc" -#include "../hyperleveldb/util/env.cc" -#include "../hyperleveldb/util/filter_policy.cc" -#include "../hyperleveldb/util/hash.cc" -#include "../hyperleveldb/util/histogram.cc" -#include "../hyperleveldb/util/logging.cc" -#include "../hyperleveldb/util/options.cc" -#include "../hyperleveldb/util/status.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Platform Specific #if defined (LEVELDB_PLATFORM_WINDOWS) -# include "../hyperleveldb/util/env_win.cc" -# include "../hyperleveldb/port/port_win.cc" +#include "../hyperleveldb/util/env_win.cc" +#include "../hyperleveldb/port/port_win.cc" #elif defined (LEVELDB_PLATFORM_POSIX) -# include "../hyperleveldb/util/env_posix.cc" -# include "../hyperleveldb/port/port_posix.cc" +#include +#include #elif defined (LEVELDB_PLATFORM_ANDROID) # error Missing Android port! diff --git a/src/ripple_leveldb/ripple_leveldb.unity.cpp b/src/ripple_leveldb/ripple_leveldb.unity.cpp index c7aa9906ca..4e7f854ce6 100644 --- a/src/ripple_leveldb/ripple_leveldb.unity.cpp +++ b/src/ripple_leveldb/ripple_leveldb.unity.cpp @@ -21,9 +21,9 @@ #include "../../BeastConfig.h" -#include "ripple_leveldb.h" +#include -#include "../beast/beast/Config.h" +#include // Set the appropriate LevelDB platform macro based on our platform. // @@ -44,53 +44,53 @@ #endif -#include "../leveldb/db/builder.cc" -#include "../leveldb/db/db_impl.cc" -#include "../leveldb/db/db_iter.cc" -#include "../leveldb/db/dbformat.cc" -#include "../leveldb/db/filename.cc" -#include "../leveldb/db/log_reader.cc" -#include "../leveldb/db/log_writer.cc" -#include "../leveldb/db/memtable.cc" -#include "../leveldb/db/repair.cc" -#include "../leveldb/db/table_cache.cc" -#include "../leveldb/db/version_edit.cc" -#include "../leveldb/db/version_set.cc" -#include "../leveldb/db/write_batch.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../leveldb/table/block.cc" -#include "../leveldb/table/block_builder.cc" -#include "../leveldb/table/filter_block.cc" -#include "../leveldb/table/format.cc" -#include "../leveldb/table/iterator.cc" -#include "../leveldb/table/merger.cc" -#include "../leveldb/table/table.cc" -#include "../leveldb/table/table_builder.cc" -#include "../leveldb/table/two_level_iterator.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../leveldb/util/arena.cc" -#include "../leveldb/util/bloom.cc" -#include "../leveldb/util/cache.cc" -#include "../leveldb/util/coding.cc" -#include "../leveldb/util/comparator.cc" -#include "../leveldb/util/crc32c.cc" -#include "../leveldb/util/env.cc" -#include "../leveldb/util/filter_policy.cc" -#include "../leveldb/util/hash.cc" -#include "../leveldb/util/histogram.cc" -#include "../leveldb/util/logging.cc" -#include "../leveldb/util/options.cc" -#include "../leveldb/util/status.cc" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Platform Specific #if defined (LEVELDB_PLATFORM_WINDOWS) -# include "../leveldb/util/env_win.cc" -# include "../leveldb/port/port_win.cc" +#include +#include #elif defined (LEVELDB_PLATFORM_POSIX) -# include "../leveldb/util/env_posix.cc" -# include "../leveldb/port/port_posix.cc" +#include +#include #elif defined (LEVELDB_PLATFORM_ANDROID) # error Missing Android port! diff --git a/src/ripple_net/basics/HTTPRequest.cpp b/src/ripple_net/basics/HTTPRequest.cpp index 66e222ffaa..7eb936bfb7 100644 --- a/src/ripple_net/basics/HTTPRequest.cpp +++ b/src/ripple_net/basics/HTTPRequest.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/modules/beast_core/text/LexicalCast.h" +#include #include diff --git a/src/ripple_net/basics/RPCDoor.cpp b/src/ripple_net/basics/RPCDoor.cpp index d2d2288cc6..83cb1c53c8 100644 --- a/src/ripple_net/basics/RPCDoor.cpp +++ b/src/ripple_net/basics/RPCDoor.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple/common/RippleSSLContext.h" +#include namespace ripple { diff --git a/src/ripple_net/basics/SNTPClient.cpp b/src/ripple_net/basics/SNTPClient.cpp index f08e0d9673..61e1ce7fbd 100644 --- a/src/ripple_net/basics/SNTPClient.cpp +++ b/src/ripple_net/basics/SNTPClient.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/threads/Thread.h" +#include namespace ripple { diff --git a/src/ripple_net/basics/impl/RPCServerImp.h b/src/ripple_net/basics/impl/RPCServerImp.h index ee0b51720d..74dcfc1030 100644 --- a/src/ripple_net/basics/impl/RPCServerImp.h +++ b/src/ripple_net/basics/impl/RPCServerImp.h @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../beast/beast/asio/IPAddressConversion.h" +#include namespace ripple { diff --git a/src/ripple_net/ripple_net.h b/src/ripple_net/ripple_net.h index 1c2d7e13b6..c3104eaf3c 100644 --- a/src/ripple_net/ripple_net.h +++ b/src/ripple_net/ripple_net.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_NET_H_INCLUDED #define RIPPLE_NET_H_INCLUDED -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include // For InfoSub #include @@ -28,23 +28,23 @@ #define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER /**/ #include -#include "../ripple/resource/ripple_resource.h" +#include -#include "../ripple_basics/ripple_basics.h" -#include "../ripple_core/ripple_core.h" -#include "../ripple_data/ripple_data.h" -#include "../ripple_websocket/autosocket/AutoSocket.h" +#include +#include +#include +#include -#include "basics/HTTPRequest.h" -#include "basics/HTTPClient.h" -#include "basics/RPCServer.h" -#include "basics/RPCDoor.h" -#include "basics/SNTPClient.h" +#include +#include +#include +#include +#include -# include "rpc/RPCErr.h" -# include "rpc/RPCUtil.h" -#include "rpc/RPCCall.h" -# include "rpc/InfoSub.h" -#include "rpc/RPCSub.h" +#include +#include +#include +#include +#include #endif diff --git a/src/ripple_net/ripple_net.unity.cpp b/src/ripple_net/ripple_net.unity.cpp index f662a4c8ae..5fc128a3f6 100644 --- a/src/ripple_net/ripple_net.unity.cpp +++ b/src/ripple_net/ripple_net.unity.cpp @@ -28,7 +28,7 @@ #include "../../BeastConfig.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include #include @@ -40,25 +40,25 @@ #include #include -#include "ripple_net.h" +#include -#include "../ripple_websocket/ripple_websocket.h" // for HTTPClient, RPCDoor +#include // for HTTPClient, RPCDoor // VFALCO NOTE This is the "new new new" where individual headers are included // directly (instead of th emodule header). The corresponding .cpp // still uses the unity style inclusion. // -#include "../ripple_rpc/api/ErrorCodes.h" -#include "../ripple/common/jsonrpc_fields.h" +#include +#include -#include "basics/HTTPRequest.cpp" -#include "basics/HTTPClient.cpp" -# include "basics/impl/RPCServerImp.h" -#include "basics/SNTPClient.cpp" -#include "rpc/RPCCall.cpp" -#include "rpc/RPCErr.cpp" -#include "rpc/RPCSub.cpp" -#include "rpc/RPCUtil.cpp" -#include "rpc/InfoSub.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "basics/RPCDoor.cpp" +#include diff --git a/src/ripple_overlay/api/Message.h b/src/ripple_overlay/api/Message.h index 311428e1e9..ed82fb1de5 100644 --- a/src/ripple_overlay/api/Message.h +++ b/src/ripple_overlay/api/Message.h @@ -22,7 +22,7 @@ #include "ripple.pb.h" -#include "../../beast/modules/beast_core/system/BeforeBoost.h" +#include #include #include diff --git a/src/ripple_overlay/api/Overlay.h b/src/ripple_overlay/api/Overlay.h index 6d1be90835..916d8e99c5 100644 --- a/src/ripple_overlay/api/Overlay.h +++ b/src/ripple_overlay/api/Overlay.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_OVERLAY_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_OVERLAY_H_INCLUDED -#include "Peer.h" +#include // VFALCO TODO Remove this include dependency it shouldn't be needed -#include "../../ripple/peerfinder/api/Slot.h" +#include -#include "../../beast/beast/threads/Stoppable.h" -#include "../../beast/beast/utility/PropertyStream.h" +#include +#include -#include "../../beast/beast/cxx14/type_traits.h" // +#include // namespace ripple { diff --git a/src/ripple_overlay/api/Peer.h b/src/ripple_overlay/api/Peer.h index 79dc5a424d..719ea429ca 100644 --- a/src/ripple_overlay/api/Peer.h +++ b/src/ripple_overlay/api/Peer.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_OVERLAY_PEER_H_INCLUDED #define RIPPLE_OVERLAY_PEER_H_INCLUDED -#include "Message.h" +#include -#include "../../ripple/json/ripple_json.h" -#include "../../ripple/types/api/base_uint.h" -#include "../../ripple_data/protocol/RippleAddress.h" +#include +#include +#include -#include "../../beast/beast/net/IPEndpoint.h" +#include namespace ripple { diff --git a/src/ripple_overlay/api/make_Overlay.h b/src/ripple_overlay/api/make_Overlay.h index 403010aa03..a5fb1d288d 100644 --- a/src/ripple_overlay/api/make_Overlay.h +++ b/src/ripple_overlay/api/make_Overlay.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED -#include "Overlay.h" +#include -#include "../../ripple/resource/api/Manager.h" -#include "../../ripple/sitefiles/api/Manager.h" -#include "../../ripple/common/Resolver.h" +#include +#include +#include -#include "../../beast/beast/threads/Stoppable.h" -#include "../../beast/modules/beast_core/files/File.h" +#include +#include #include #include diff --git a/src/ripple_overlay/api/predicates.h b/src/ripple_overlay/api/predicates.h index f2925e4062..6ec7aaf4d7 100644 --- a/src/ripple_overlay/api/predicates.h +++ b/src/ripple_overlay/api/predicates.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_PREDICATES_H_INCLUDED #define RIPPLE_OVERLAY_PREDICATES_H_INCLUDED -#include "Message.h" -#include "Peer.h" +#include +#include #include diff --git a/src/ripple_overlay/impl/Message.cpp b/src/ripple_overlay/impl/Message.cpp index 4c88087183..c51c9d7dd9 100644 --- a/src/ripple_overlay/impl/Message.cpp +++ b/src/ripple_overlay/impl/Message.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../api/Message.h" +#include #include diff --git a/src/ripple_overlay/impl/OverlayImpl.cpp b/src/ripple_overlay/impl/OverlayImpl.cpp index ab79596731..e2b2cb43c6 100644 --- a/src/ripple_overlay/impl/OverlayImpl.cpp +++ b/src/ripple_overlay/impl/OverlayImpl.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "OverlayImpl.h" -#include "PeerDoor.h" -#include "PeerImp.h" +#include +#include +#include -#include "../../beast/beast/ByteOrder.h" +#include namespace ripple { diff --git a/src/ripple_overlay/impl/OverlayImpl.h b/src/ripple_overlay/impl/OverlayImpl.h index b6f4d359e3..679eb261d1 100644 --- a/src/ripple_overlay/impl/OverlayImpl.h +++ b/src/ripple_overlay/impl/OverlayImpl.h @@ -20,19 +20,19 @@ #ifndef RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED #define RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED -#include "../api/Overlay.h" +#include -#include "../../ripple/common/Resolver.h" -#include "../../ripple/common/seconds_clock.h" -#include "../../ripple/peerfinder/api/Callback.h" -#include "../../ripple/peerfinder/api/Manager.h" -#include "../../ripple/resource/api/Manager.h" +#include +#include +#include +#include +#include #include #include #include -#include "../../beast/beast/cxx14/memory.h" // +#include // #include #include #include diff --git a/src/ripple_overlay/impl/PeerDoor.cpp b/src/ripple_overlay/impl/PeerDoor.cpp index 9a82e06728..09d4cf1ba5 100644 --- a/src/ripple_overlay/impl/PeerDoor.cpp +++ b/src/ripple_overlay/impl/PeerDoor.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "OverlayImpl.h" -#include "PeerDoor.h" +#include +#include namespace ripple { diff --git a/src/ripple_overlay/impl/PeerDoor.h b/src/ripple_overlay/impl/PeerDoor.h index 1011937f7e..89e7ea9cef 100644 --- a/src/ripple_overlay/impl/PeerDoor.h +++ b/src/ripple_overlay/impl/PeerDoor.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERDOOR_H_INCLUDED #define RIPPLE_PEERDOOR_H_INCLUDED -#include "OverlayImpl.h" +#include -#include "../../beast/beast/cxx14/memory.h" // +#include // namespace ripple { diff --git a/src/ripple_overlay/impl/PeerImp.h b/src/ripple_overlay/impl/PeerImp.h index 7481cf1adf..1bbbfab123 100644 --- a/src/ripple_overlay/impl/PeerImp.h +++ b/src/ripple_overlay/impl/PeerImp.h @@ -20,20 +20,20 @@ #ifndef RIPPLE_OVERLAY_PEERIMP_H_INCLUDED #define RIPPLE_OVERLAY_PEERIMP_H_INCLUDED -#include "../api/predicates.h" +#include -#include "../../ripple/common/MultiSocket.h" -#include "../../ripple_data/protocol/Protocol.h" -#include "../../ripple/validators/ripple_validators.h" -#include "../../ripple/peerfinder/ripple_peerfinder.h" -#include "../../ripple_app/misc/ProofOfWork.h" -#include "../../ripple_app/misc/ProofOfWorkFactory.h" +#include +#include +#include +#include +#include +#include // VFALCO This is unfortunate. Comment this out and // just include what is needed. -#include "../../ripple_app/ripple_app.h" +#include -#include "../../beast/beast/asio/IPAddressConversion.h" +#include #include diff --git a/src/ripple_overlay/ripple_overlay.unity.cpp b/src/ripple_overlay/ripple_overlay.unity.cpp index 5d6bad7741..de33d60d7b 100644 --- a/src/ripple_overlay/ripple_overlay.unity.cpp +++ b/src/ripple_overlay/ripple_overlay.unity.cpp @@ -19,8 +19,8 @@ #include "../../BeastConfig.h" -#include "impl/Message.cpp" -#include "impl/OverlayImpl.cpp" -#include "impl/PeerImp.h" -#include "impl/PeerDoor.cpp" +#include +#include +#include +#include diff --git a/src/ripple_rpc/api/ErrorCodes.h b/src/ripple_rpc/api/ErrorCodes.h index af924c45f5..1deab092f3 100644 --- a/src/ripple_rpc/api/ErrorCodes.h +++ b/src/ripple_rpc/api/ErrorCodes.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_ERRORCODES_H_INCLUDED #define RIPPLE_RPC_ERRORCODES_H_INCLUDED -#include "../../ripple/json/ripple_json.h" +#include namespace ripple { diff --git a/src/ripple_rpc/api/Manager.h b/src/ripple_rpc/api/Manager.h index 1713e9a972..c11d56cb3f 100644 --- a/src/ripple_rpc/api/Manager.h +++ b/src/ripple_rpc/api/Manager.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RPC_MANAGER_H_INCLUDED #define RIPPLE_RPC_MANAGER_H_INCLUDED -#include "Request.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/api/Request.h b/src/ripple_rpc/api/Request.h index b5ae41baa2..ee30b82309 100644 --- a/src/ripple_rpc/api/Request.h +++ b/src/ripple_rpc/api/Request.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_REQUEST_H_INCLUDED #define RIPPLE_RPC_REQUEST_H_INCLUDED -#include "../../ripple/json/ripple_json.h" -#include "../../ripple/resource/ripple_resource.h" +#include +#include namespace ripple { diff --git a/src/ripple_rpc/handlers/Connect.cpp b/src/ripple_rpc/handlers/Connect.cpp index e4c23043d8..ec3f44267d 100644 --- a/src/ripple_rpc/handlers/Connect.cpp +++ b/src/ripple_rpc/handlers/Connect.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_overlay/api/Overlay.h" +#include namespace ripple { diff --git a/src/ripple_rpc/handlers/Peers.cpp b/src/ripple_rpc/handlers/Peers.cpp index 3f3a2c7e74..60dcd19050 100644 --- a/src/ripple_rpc/handlers/Peers.cpp +++ b/src/ripple_rpc/handlers/Peers.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../ripple_overlay/api/Overlay.h" +#include namespace ripple { diff --git a/src/ripple_rpc/handlers/RipplePathFind.cpp b/src/ripple_rpc/handlers/RipplePathFind.cpp index a5f450b0a9..3bd9c21bc8 100644 --- a/src/ripple_rpc/handlers/RipplePathFind.cpp +++ b/src/ripple_rpc/handlers/RipplePathFind.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../impl/LegacyPathFind.h" +#include namespace ripple { diff --git a/src/ripple_rpc/impl/AccountFromString.cpp b/src/ripple_rpc/impl/AccountFromString.cpp index 23fdf592fc..6ac438a98a 100644 --- a/src/ripple_rpc/impl/AccountFromString.cpp +++ b/src/ripple_rpc/impl/AccountFromString.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "AccountFromString.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/Accounts.cpp b/src/ripple_rpc/impl/Accounts.cpp index b7e9998c97..a0bd97c6ca 100644 --- a/src/ripple_rpc/impl/Accounts.cpp +++ b/src/ripple_rpc/impl/Accounts.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "Accounts.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/Authorize.cpp b/src/ripple_rpc/impl/Authorize.cpp index c0fbbe60de..a0e66a525a 100644 --- a/src/ripple_rpc/impl/Authorize.cpp +++ b/src/ripple_rpc/impl/Authorize.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "Authorize.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/ErrorCodes.cpp b/src/ripple_rpc/impl/ErrorCodes.cpp index db9c71ddb1..0a6ea81ccf 100644 --- a/src/ripple_rpc/impl/ErrorCodes.cpp +++ b/src/ripple_rpc/impl/ErrorCodes.cpp @@ -20,7 +20,7 @@ #include #include -#include "../api/ErrorCodes.h" +#include namespace std { diff --git a/src/ripple_rpc/impl/GetMasterGenerator.cpp b/src/ripple_rpc/impl/GetMasterGenerator.cpp index 3d25041373..31fd03ff83 100644 --- a/src/ripple_rpc/impl/GetMasterGenerator.cpp +++ b/src/ripple_rpc/impl/GetMasterGenerator.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "GetMasterGenerator.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/Handlers.cpp b/src/ripple_rpc/impl/Handlers.cpp index d73c057a06..8ec4d1b1ca 100644 --- a/src/ripple_rpc/impl/Handlers.cpp +++ b/src/ripple_rpc/impl/Handlers.cpp @@ -17,75 +17,75 @@ */ //============================================================================== -#include "../handlers/AccountCurrencies.cpp" -#include "../handlers/AccountInfo.cpp" -#include "../handlers/AccountLines.cpp" -#include "../handlers/AccountOffers.cpp" -#include "../handlers/AccountTx.cpp" -#include "../handlers/AccountTxOld.cpp" -#include "../handlers/AccountTxSwitch.cpp" -#include "../handlers/BlackList.cpp" -#include "../handlers/BookOffers.cpp" -#include "../handlers/Connect.cpp" -#include "../handlers/ConsensusInfo.cpp" -#include "../handlers/Feature.cpp" -#include "../handlers/FetchInfo.cpp" -#include "../handlers/GetCounts.cpp" -#include "../handlers/Ledger.cpp" -#include "../handlers/LedgerAccept.cpp" -#include "../handlers/LedgerCleaner.cpp" -#include "../handlers/LedgerClosed.cpp" -#include "../handlers/LedgerCurrent.cpp" -#include "../handlers/LedgerData.cpp" -#include "../handlers/LedgerEntry.cpp" -#include "../handlers/LedgerHeader.cpp" -#include "../handlers/LogLevel.cpp" -#include "../handlers/LogRotate.cpp" -#include "../handlers/NicknameInfo.cpp" -#include "../handlers/OwnerInfo.cpp" -#include "../handlers/PathFind.cpp" -#include "../handlers/Peers.cpp" -#include "../handlers/Ping.cpp" -#include "../handlers/Print.cpp" -#include "../handlers/Profile.cpp" -#include "../handlers/ProofCreate.cpp" -#include "../handlers/ProofSolve.cpp" -#include "../handlers/ProofVerify.cpp" -#include "../handlers/Random.cpp" -#include "../handlers/RipplePathFind.cpp" -#include "../handlers/SMS.cpp" -#include "../handlers/ServerInfo.cpp" -#include "../handlers/ServerState.cpp" -#include "../handlers/Sign.cpp" -#include "../handlers/Stop.cpp" -#include "../handlers/Submit.cpp" -#include "../handlers/Subscribe.cpp" -#include "../handlers/TransactionEntry.cpp" -#include "../handlers/Tx.cpp" -#include "../handlers/TxHistory.cpp" -#include "../handlers/UnlAdd.cpp" -#include "../handlers/UnlDelete.cpp" -#include "../handlers/UnlList.cpp" -#include "../handlers/UnlLoad.cpp" -#include "../handlers/UnlNetwork.cpp" -#include "../handlers/UnlReset.cpp" -#include "../handlers/UnlScore.cpp" -#include "../handlers/Unsubscribe.cpp" -#include "../handlers/ValidationCreate.cpp" -#include "../handlers/ValidationSeed.cpp" -#include "../handlers/WalletAccounts.cpp" -#include "../handlers/WalletPropose.cpp" -#include "../handlers/WalletSeed.cpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "AccountFromString.cpp" -#include "Accounts.cpp" -#include "Authorize.cpp" -#include "GetMasterGenerator.cpp" -#include "LegacyPathFind.cpp" -#include "LookupLedger.cpp" -#include "ParseAccountIds.cpp" -#include "TransactionSign.cpp" +#include +#include +#include +#include +#include +#include +#include +#include -#include "../../ripple_overlay/api/Overlay.h" +#include #include diff --git a/src/ripple_rpc/impl/LegacyPathFind.cpp b/src/ripple_rpc/impl/LegacyPathFind.cpp index 545c47bd61..8580f8c535 100644 --- a/src/ripple_rpc/impl/LegacyPathFind.cpp +++ b/src/ripple_rpc/impl/LegacyPathFind.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "LegacyPathFind.h" -#include "../api/Tuning.h" +#include +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/LookupLedger.cpp b/src/ripple_rpc/impl/LookupLedger.cpp index ed28e9cbd1..9fc386f857 100644 --- a/src/ripple_rpc/impl/LookupLedger.cpp +++ b/src/ripple_rpc/impl/LookupLedger.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "LookupLedger.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/Manager.cpp b/src/ripple_rpc/impl/Manager.cpp index 630664f2b6..fd6cc83b3e 100644 --- a/src/ripple_rpc/impl/Manager.cpp +++ b/src/ripple_rpc/impl/Manager.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include "../../beast/beast/cxx14/memory.h" +#include -#include "../api/Manager.h" +#include -#include "DoPrint.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/ParseAccountIds.cpp b/src/ripple_rpc/impl/ParseAccountIds.cpp index ba439df504..56d3aecf96 100644 --- a/src/ripple_rpc/impl/ParseAccountIds.cpp +++ b/src/ripple_rpc/impl/ParseAccountIds.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "ParseAccountIds.h" +#include namespace ripple { namespace RPC { diff --git a/src/ripple_rpc/impl/TransactionSign.cpp b/src/ripple_rpc/impl/TransactionSign.cpp index 605da43bb8..fdfb5ad7bf 100644 --- a/src/ripple_rpc/impl/TransactionSign.cpp +++ b/src/ripple_rpc/impl/TransactionSign.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "TransactionSign.h" +#include namespace ripple { diff --git a/src/ripple_rpc/ripple_rpc.h b/src/ripple_rpc/ripple_rpc.h index 4452298cc3..bb1b7ec18b 100644 --- a/src/ripple_rpc/ripple_rpc.h +++ b/src/ripple_rpc/ripple_rpc.h @@ -20,10 +20,8 @@ #ifndef RIPPLE_RPC_H_INCLUDED #define RIPPLE_RPC_H_INCLUDED -//#include "../beast/modules/beast_core/beast_core.h" - -#include "api/ErrorCodes.h" -#include "api/Manager.h" -#include "api/Request.h" +#include +#include +#include #endif diff --git a/src/ripple_rpc/ripple_rpc.unity.cpp b/src/ripple_rpc/ripple_rpc.unity.cpp index 400531faa7..6551bbb989 100644 --- a/src/ripple_rpc/ripple_rpc.unity.cpp +++ b/src/ripple_rpc/ripple_rpc.unity.cpp @@ -19,12 +19,12 @@ #include "../../BeastConfig.h" -#include "ripple_rpc.h" +#include // Unfortunate but necessary since RPC handlers can literally do anything -#include "../ripple_app/ripple_app.h" +#include -#include "impl/ErrorCodes.cpp" -#include "impl/Manager.cpp" +#include +#include diff --git a/src/ripple_websocket/autosocket/AutoSocket.h b/src/ripple_websocket/autosocket/AutoSocket.h index 109fab3c56..6cebf6426b 100644 --- a/src/ripple_websocket/autosocket/AutoSocket.h +++ b/src/ripple_websocket/autosocket/AutoSocket.h @@ -20,7 +20,7 @@ #ifndef __AUTOSOCKET_H_ #define __AUTOSOCKET_H_ -#include "../../beast/beast/asio/bind_handler.h" +#include // Socket wrapper that supports both SSL and non-SSL connections. // Generally, handle it as you would an SSL connection. diff --git a/src/ripple_websocket/ripple_websocket.h b/src/ripple_websocket/ripple_websocket.h index 193366c03c..4a0c9f7586 100644 --- a/src/ripple_websocket/ripple_websocket.h +++ b/src/ripple_websocket/ripple_websocket.h @@ -25,17 +25,17 @@ #define __STDC_LIMIT_MACROS #endif -#include "../ripple_net/ripple_net.h" +#include -#include "../beast/modules/beast_core/text/LexicalCast.h" -#include "../beast/modules/beast_core/system/BeforeBoost.h" +#include +#include #include #include -#include "../websocket/src/common.hpp" -#include "../websocket/src/sockets/socket_base.hpp" -#include "../websocket/src/sockets/multitls.hpp" -#include "../websocket/src/websocketpp.hpp" -#include "../websocket/src/logger/logger.hpp" +#include +#include +#include +#include +#include #endif diff --git a/src/ripple_websocket/ripple_websocket.unity.cpp b/src/ripple_websocket/ripple_websocket.unity.cpp index b7460c2999..1514753a87 100644 --- a/src/ripple_websocket/ripple_websocket.unity.cpp +++ b/src/ripple_websocket/ripple_websocket.unity.cpp @@ -24,23 +24,23 @@ #endif #include -#include "ripple_websocket.h" +#include // Unity build file for websocket // -#include "../websocket/src/sha1/sha1.h" +#include // Must come first to prevent compile errors -#include "../websocket/src/uri.cpp" +#include -#include "../websocket/src/base64/base64.cpp" -#include "../websocket/src/messages/data.cpp" -#include "../websocket/src/processors/hybi_header.cpp" -#include "../websocket/src/processors/hybi_util.cpp" -#include "../websocket/src/md5/md5.c" -#include "../websocket/src/network_utilities.cpp" -#include "../websocket/src/sha1/sha1.cpp" +#include +#include +#include +#include +#include +#include +#include -#include "autosocket/AutoSocket.cpp" -#include "autosocket/LogWebsockets.cpp" +#include +#include diff --git a/src/snappy/snappy.unity.cpp b/src/snappy/snappy.unity.cpp index abb426ea6f..731f74eb6f 100644 --- a/src/snappy/snappy.unity.cpp +++ b/src/snappy/snappy.unity.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../BeastConfig.h" +#include #ifdef _MSC_VER #include @@ -26,9 +26,9 @@ typedef std::ptrdiff_t ssize_t; } #endif -#include "snappy/snappy.cc" -#include "snappy/snappy-sinksource.cc" -#include "snappy/snappy-stubs-internal.cc" +#include +#include +#include //#include "./snappy_unittest.cc" //#include "./snappy-test.cc"#include "./snappy-c.cc" diff --git a/src/websocket/src/sockets/multitls.hpp b/src/websocket/src/sockets/multitls.hpp index 783f638fc1..ec1ef3afc6 100644 --- a/src/websocket/src/sockets/multitls.hpp +++ b/src/websocket/src/sockets/multitls.hpp @@ -28,7 +28,7 @@ #ifndef WEBSOCKETPP_SOCKET_MULTITLS_HPP #define WEBSOCKETPP_SOCKET_MULTITLS_HPP -#include "../../ripple/common/MultiSocket.h" +#include namespace websocketpp { namespace socket {