From ce8f56727e05e89b98da664fb71779232a5927d2 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/Beast.props | 6 +- beast/Arithmetic.h | 4 +- beast/Atomic.h | 6 +- beast/Boost.h | 2 +- beast/ByteOrder.h | 4 +- beast/Chrono.h | 14 +- beast/Config.h | 18 +-- beast/Crypto.h | 10 +- beast/HeapBlock.h | 4 +- beast/Insight.h | 26 ++-- beast/Intrusive.h | 4 +- beast/Memory.h | 4 +- beast/SmartPtr.h | 10 +- beast/Strings.h | 4 +- beast/Threads.h | 26 ++-- beast/asio/Asio.unity.cpp | 14 +- beast/asio/IPAddressConversion.h | 2 +- beast/asio/abstract_socket.cpp | 4 +- beast/asio/abstract_socket.h | 4 +- beast/asio/bind_handler.h | 4 +- beast/asio/buffer_sequence.h | 4 +- beast/asio/enable_wait_for_async.h | 6 +- beast/asio/impl/IPAddressConversion.cpp | 2 +- beast/asio/memory_buffer.h | 4 +- beast/asio/shared_handler.h | 8 +- 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 +- beast/asio/wrap_handler.h | 2 +- beast/boost/Boost.unity.cpp | 4 +- beast/chrono/Chrono.unity.cpp | 12 +- beast/chrono/RelativeTime.h | 6 +- beast/chrono/abstract_clock_io.h | 2 +- beast/chrono/basic_seconds_clock.h | 18 +-- beast/chrono/chrono_io.h | 6 +- beast/chrono/impl/RelativeTime.cpp | 2 +- beast/chrono/impl/chrono_io.cpp | 2 +- beast/chrono/manual_clock.h | 2 +- beast/chrono/tests/abstract_clock.test.cpp | 8 +- .../chrono/tests/basic_seconds_clock.test.cpp | 4 +- beast/config/CompilerConfig.h | 2 +- beast/config/StandardConfig.h | 16 +-- beast/config/compiler/VisualC.h | 2 +- beast/container/Container.unity.cpp | 12 +- beast/container/aged_container_utility.h | 2 +- beast/container/aged_map.h | 2 +- beast/container/aged_multimap.h | 2 +- beast/container/aged_multiset.h | 2 +- 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 +- beast/container/buffer_view.h | 6 +- .../container/detail/aged_ordered_container.h | 14 +- .../detail/aged_unordered_container.h | 14 +- beast/container/hardened_hash.h | 8 +- beast/container/hash_append.h | 10 +- beast/container/impl/spookyv2.cpp | 2 +- beast/container/impl/spookyv2.h | 2 +- .../tests/aged_associative_container.test.cpp | 20 +-- beast/container/tests/buffer_view.test.cpp | 6 +- beast/container/tests/hardened_hash.test.cpp | 8 +- beast/container/tests/hash_append.test.cpp | 14 +- beast/crypto/Crypto.unity.cpp | 12 +- beast/crypto/Sha256.h | 2 +- beast/crypto/UnsignedInteger.h | 10 +- beast/crypto/UnsignedIntegerCalc.h | 2 +- beast/crypto/impl/MurmurHash.cpp | 2 +- beast/crypto/impl/Sha256.cpp | 4 +- beast/crypto/impl/UnsignedInteger.cpp | 4 +- beast/crypto/tests/BinaryEncoding.cpp | 8 +- beast/crypto/tests/UnsignedInteger.test.cpp | 4 +- beast/cxx14/algorithm.h | 4 +- beast/cxx14/cxx14.unity.cpp | 2 +- beast/cxx14/functional.h | 2 +- beast/cxx14/iterator.h | 2 +- beast/cxx14/memory.h | 2 +- beast/cxx14/tests/integer_sequence.test.cpp | 6 +- beast/cxx14/type_traits.h | 2 +- beast/cxx14/utility.h | 2 +- beast/http/HTTP.unity.cpp | 22 +-- beast/http/ParsedURL.h | 4 +- beast/http/URL.h | 2 +- beast/http/basic_url.h | 2 +- beast/http/client_session.h | 22 +-- beast/http/detail/header_traits.h | 2 +- beast/http/impl/ParsedURL.cpp | 6 +- beast/http/impl/URL.cpp | 2 +- beast/http/impl/basic_url.cpp | 4 +- beast/http/impl/get.cpp | 4 +- beast/http/impl/joyent_parser.cpp | 6 +- beast/http/impl/joyent_parser.h | 4 +- beast/http/impl/raw_parser.cpp | 4 +- beast/http/raw_parser.h | 2 +- beast/http/tests/ParsedURL.cpp | 6 +- beast/http/tests/basic_message.test.cpp | 2 +- beast/http/tests/basic_url.test.cpp | 4 +- beast/http/tests/client_session.test.cpp | 14 +- beast/http/tests/urls_large_data.cpp | 2 +- beast/insight/Collector.h | 10 +- beast/insight/Counter.h | 4 +- beast/insight/CounterImpl.h | 2 +- beast/insight/Event.h | 6 +- beast/insight/EventImpl.h | 2 +- beast/insight/Gauge.h | 4 +- beast/insight/GaugeImpl.h | 2 +- beast/insight/Group.h | 2 +- beast/insight/Groups.h | 4 +- beast/insight/Hook.h | 4 +- beast/insight/HookImpl.h | 2 +- beast/insight/Insight.unity.cpp | 20 +-- beast/insight/Meter.h | 4 +- beast/insight/MeterImpl.h | 2 +- beast/insight/NullCollector.h | 2 +- beast/insight/StatsDCollector.h | 6 +- beast/insight/impl/Groups.cpp | 2 +- beast/insight/impl/StatsDCollector.cpp | 6 +- beast/intrusive/List.h | 4 +- beast/intrusive/LockFreeStack.h | 4 +- beast/net/IPAddress.h | 6 +- beast/net/IPAddressV4.h | 2 +- beast/net/IPEndpoint.h | 4 +- beast/net/Net.unity.cpp | 12 +- beast/net/impl/DynamicBuffer.cpp | 2 +- beast/net/impl/IPAddressV4.cpp | 4 +- beast/net/impl/IPAddressV6.cpp | 2 +- beast/net/impl/IPEndpoint.cpp | 4 +- beast/net/tests/IPEndpoint.test.cpp | 6 +- beast/smart_ptr/ScopedPointer.h | 8 +- beast/smart_ptr/SharedObject.h | 4 +- beast/smart_ptr/SharedPtr.h | 4 +- beast/streams/abstract_ostream.h | 2 +- beast/streams/basic_abstract_ostream.h | 2 +- beast/streams/basic_scoped_ostream.h | 2 +- beast/streams/basic_std_ostream.h | 2 +- beast/streams/debug_ostream.h | 6 +- beast/streams/streams.unity.cpp | 2 +- .../tests/basic_abstract_ostream.test.cpp | 4 +- beast/strings/CharPointer_ASCII.h | 4 +- beast/strings/CharPointer_UTF16.h | 6 +- beast/strings/CharPointer_UTF32.h | 6 +- beast/strings/CharPointer_UTF8.h | 6 +- beast/strings/CharacterFunctions.h | 4 +- beast/strings/NewLine.h | 4 +- beast/strings/String.h | 20 +-- beast/strings/StringCharPointerType.h | 8 +- beast/strings/StringFromNumber.h | 6 +- beast/strings/Strings.unity.cpp | 4 +- beast/strings/impl/CharacterFunctions.cpp | 2 +- beast/strings/impl/String.cpp | 14 +- beast/threads/RecursiveMutex.h | 6 +- beast/threads/ServiceQueue.h | 10 +- beast/threads/SharedData.h | 4 +- beast/threads/SharedLockGuard.h | 2 +- beast/threads/SharedMutexAdapter.h | 2 +- beast/threads/SpinLock.h | 4 +- beast/threads/Stoppable.h | 8 +- beast/threads/Thread.h | 8 +- beast/threads/ThreadLocalValue.h | 6 +- beast/threads/Threads.unity.cpp | 16 +-- beast/threads/TryLockGuard.h | 2 +- beast/threads/UnlockGuard.h | 2 +- beast/threads/WaitableEvent.h | 4 +- beast/threads/detail/DispatchedHandler.h | 2 +- beast/threads/impl/RecursiveMutex.cpp | 10 +- beast/threads/impl/ServiceQueue.cpp | 2 +- beast/threads/impl/Stoppable.cpp | 2 +- beast/threads/impl/Thread.cpp | 12 +- beast/threads/impl/WaitableEvent.cpp | 2 +- beast/threads/tests/Atomic.test.cpp | 8 +- beast/threads/tests/ServiceQueue.cpp | 8 +- beast/unit_test.h | 22 +-- beast/unit_test/define_print.cpp | 6 +- beast/unit_test/global_suites.h | 2 +- beast/unit_test/match.h | 2 +- beast/unit_test/print.h | 8 +- beast/unit_test/recorder.h | 4 +- beast/unit_test/reporter.h | 8 +- beast/unit_test/results.h | 2 +- beast/unit_test/runner.h | 4 +- beast/unit_test/suite.h | 6 +- beast/unit_test/suite_list.h | 4 +- beast/unit_test/tests/main.cpp | 8 +- beast/utility/Debug.h | 2 +- beast/utility/Error.h | 4 +- beast/utility/LeakChecked.h | 8 +- beast/utility/PropertyStream.h | 6 +- beast/utility/Utility.unity.cpp | 22 +-- beast/utility/Zero.h | 2 +- beast/utility/empty_base_optimization.h | 2 +- beast/utility/impl/Debug.cpp | 6 +- beast/utility/impl/Error.cpp | 4 +- beast/utility/impl/Journal.cpp | 4 +- beast/utility/impl/LeakChecked.cpp | 4 +- beast/utility/impl/PropertyStream.cpp | 4 +- beast/utility/impl/StaticObject.cpp | 4 +- beast/utility/is_call_possible.h | 2 +- beast/utility/tagged_integer.h | 4 +- beast/utility/tests/Zero.test.cpp | 4 +- beast/utility/tests/bassert.test.cpp | 4 +- .../tests/empty_base_optimization.test.cpp | 6 +- beast/utility/tests/tagged_integer.test.cpp | 6 +- beast/utility/type_name.h | 2 +- modules/beast_asio/basics/FixedInputBuffer.h | 2 +- modules/beast_asio/beast_asio.h | 78 +++++----- modules/beast_asio/beast_asio.unity.cpp | 54 +++---- modules/beast_asio/http/HTTPClientType.cpp | 8 +- modules/beast_asio/http/HTTPClientType.h | 2 +- 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 +- modules/beast_asio/http/HTTPRequestParser.h | 2 +- modules/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 +- modules/beast_asio/tests/PeerTest.h | 2 +- modules/beast_asio/tests/TestPeerDetails.h | 2 +- modules/beast_asio/tests/TestPeerDetailsTcp.h | 2 +- .../beast_asio/tests/TestPeerUnitTests.cpp | 2 +- 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 +- modules/beast_core/diagnostic/FatalError.cpp | 2 +- .../beast_core/diagnostic/SemanticVersion.cpp | 2 +- modules/beast_core/files/File.cpp | 2 +- modules/beast_core/files/File.h | 12 +- modules/beast_core/files/RandomAccessFile.cpp | 2 +- modules/beast_core/maths/Random.cpp | 2 +- modules/beast_core/memory/MemoryBlock.h | 2 +- modules/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 +- modules/beast_core/thread/Workers.h | 4 +- modules/beast_core/thread/detail/ScopedLock.h | 2 +- modules/beast_core/threads/CriticalSection.h | 2 +- modules/beast_core/time/AtExitHook.h | 2 +- modules/beast_core/time/Time.h | 2 +- modules/beast_sqdb/api/session.h | 4 +- modules/beast_sqdb/api/transaction.h | 2 +- .../beast_sqdb/api/type_conversion_traits.h | 2 +- modules/beast_sqdb/beast_sqdb.h | 34 ++--- modules/beast_sqdb/beast_sqdb.unity.cpp | 34 ++--- modules/beast_sqlite/beast_sqlite.h | 6 +- modules/beast_sqlite/beast_sqlite.unity.c | 6 +- modules/beast_sqlite/sqlite/sqlite3.c | 34 ++--- site_scons/site_tools/VSProject.py | 25 +++- 261 files changed, 918 insertions(+), 913 deletions(-) diff --git a/Builds/VisualStudio2013/Beast.props b/Builds/VisualStudio2013/Beast.props index f1c7c453..1a08f492 100644 --- a/Builds/VisualStudio2013/Beast.props +++ b/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/beast/Arithmetic.h b/beast/Arithmetic.h index bcbadc43..a23b9265 100644 --- a/beast/Arithmetic.h +++ b/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/beast/Atomic.h b/beast/Atomic.h index ffeb82a6..fcae075f 100644 --- a/beast/Atomic.h +++ b/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/beast/Boost.h b/beast/Boost.h index 708b63ab..4746c0a8 100644 --- a/beast/Boost.h +++ b/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/beast/ByteOrder.h b/beast/ByteOrder.h index e17736d3..2bd06938 100644 --- a/beast/ByteOrder.h +++ b/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/beast/Chrono.h b/beast/Chrono.h index 3e8b4220..6aea7d82 100644 --- a/beast/Chrono.h +++ b/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/beast/Config.h b/beast/Config.h index b145d9fa..0170f92e 100644 --- a/beast/Config.h +++ b/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/beast/Crypto.h b/beast/Crypto.h index c84425be..27e79e04 100644 --- a/beast/Crypto.h +++ b/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/beast/HeapBlock.h b/beast/HeapBlock.h index 9fdea3e9..cbbe097c 100644 --- a/beast/HeapBlock.h +++ b/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/beast/Insight.h b/beast/Insight.h index 2ec5b42e..25c45682 100644 --- a/beast/Insight.h +++ b/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/beast/Intrusive.h b/beast/Intrusive.h index 89a3ace3..2932453c 100644 --- a/beast/Intrusive.h +++ b/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/beast/Memory.h b/beast/Memory.h index adb3717f..e84e0e68 100644 --- a/beast/Memory.h +++ b/beast/Memory.h @@ -26,8 +26,8 @@ #include -#include "Config.h" -#include "Uncopyable.h" +#include +#include namespace beast { diff --git a/beast/SmartPtr.h b/beast/SmartPtr.h index 13aab726..c1f91ff0 100644 --- a/beast/SmartPtr.h +++ b/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/beast/Strings.h b/beast/Strings.h index 5b761624..b7fa0331 100644 --- a/beast/Strings.h +++ b/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/beast/Threads.h b/beast/Threads.h index 756376a2..9f349151 100644 --- a/beast/Threads.h +++ b/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/beast/asio/Asio.unity.cpp b/beast/asio/Asio.unity.cpp index 4f964be9..dbe4b458 100644 --- a/beast/asio/Asio.unity.cpp +++ b/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/beast/asio/IPAddressConversion.h b/beast/asio/IPAddressConversion.h index 182691c0..13572340 100644 --- a/beast/asio/IPAddressConversion.h +++ b/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/beast/asio/abstract_socket.cpp b/beast/asio/abstract_socket.cpp index ba2e950e..dfd542db 100644 --- a/beast/asio/abstract_socket.cpp +++ b/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/beast/asio/abstract_socket.h b/beast/asio/abstract_socket.h index 9900e184..ec3c5cbc 100644 --- a/beast/asio/abstract_socket.h +++ b/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/beast/asio/bind_handler.h b/beast/asio/bind_handler.h index d2ce51f1..778b3723 100644 --- a/beast/asio/bind_handler.h +++ b/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/beast/asio/buffer_sequence.h b/beast/asio/buffer_sequence.h index 19489fbf..d2259eba 100644 --- a/beast/asio/buffer_sequence.h +++ b/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/beast/asio/enable_wait_for_async.h b/beast/asio/enable_wait_for_async.h index bdd3f83a..2ba0a796 100644 --- a/beast/asio/enable_wait_for_async.h +++ b/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/beast/asio/impl/IPAddressConversion.cpp b/beast/asio/impl/IPAddressConversion.cpp index d97f3811..70f61c69 100644 --- a/beast/asio/impl/IPAddressConversion.cpp +++ b/beast/asio/impl/IPAddressConversion.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../IPAddressConversion.h" +#include namespace beast { namespace IP { diff --git a/beast/asio/memory_buffer.h b/beast/asio/memory_buffer.h index 7f43be1b..f7756878 100644 --- a/beast/asio/memory_buffer.h +++ b/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/beast/asio/shared_handler.h b/beast/asio/shared_handler.h index 58e8e2c4..bc8a149a 100644 --- a/beast/asio/shared_handler.h +++ b/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/beast/asio/socket_wrapper.h b/beast/asio/socket_wrapper.h index c5df18f5..2b07c0b4 100644 --- a/beast/asio/socket_wrapper.h +++ b/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/beast/asio/tests/bind_handler.test.cpp b/beast/asio/tests/bind_handler.test.cpp index 34c1001a..551d3275 100644 --- a/beast/asio/tests/bind_handler.test.cpp +++ b/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/beast/asio/tests/enable_wait_for_async.test.cpp b/beast/asio/tests/enable_wait_for_async.test.cpp index f09f53e4..fd529fed 100644 --- a/beast/asio/tests/enable_wait_for_async.test.cpp +++ b/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/beast/asio/tests/shared_handler.test.cpp b/beast/asio/tests/shared_handler.test.cpp index 686c0f08..d32ef196 100644 --- a/beast/asio/tests/shared_handler.test.cpp +++ b/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/beast/asio/tests/wrap_handler.test.cpp b/beast/asio/tests/wrap_handler.test.cpp index be72dbb0..8c3fe0a8 100644 --- a/beast/asio/tests/wrap_handler.test.cpp +++ b/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/beast/asio/wrap_handler.h b/beast/asio/wrap_handler.h index 02ee7895..4bda7f4b 100644 --- a/beast/asio/wrap_handler.h +++ b/beast/asio/wrap_handler.h @@ -24,7 +24,7 @@ #include #include -#include "../cxx14/type_traits.h" // +#include // #include namespace beast { diff --git a/beast/boost/Boost.unity.cpp b/beast/boost/Boost.unity.cpp index f692682b..042d7f2e 100644 --- a/beast/boost/Boost.unity.cpp +++ b/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/beast/chrono/Chrono.unity.cpp b/beast/chrono/Chrono.unity.cpp index 4306d7e8..0dcc37d3 100644 --- a/beast/chrono/Chrono.unity.cpp +++ b/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/beast/chrono/RelativeTime.h b/beast/chrono/RelativeTime.h index b4e849f0..f54346db 100644 --- a/beast/chrono/RelativeTime.h +++ b/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/beast/chrono/abstract_clock_io.h b/beast/chrono/abstract_clock_io.h index bd2ad993..45f9dd81 100644 --- a/beast/chrono/abstract_clock_io.h +++ b/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/beast/chrono/basic_seconds_clock.h b/beast/chrono/basic_seconds_clock.h index 42db9ab9..bc8154f4 100644 --- a/beast/chrono/basic_seconds_clock.h +++ b/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/beast/chrono/chrono_io.h b/beast/chrono/chrono_io.h index 151297f1..a17cd4ae 100644 --- a/beast/chrono/chrono_io.h +++ b/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/beast/chrono/impl/RelativeTime.cpp b/beast/chrono/impl/RelativeTime.cpp index 853940bb..caf8131b 100644 --- a/beast/chrono/impl/RelativeTime.cpp +++ b/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/beast/chrono/impl/chrono_io.cpp b/beast/chrono/impl/chrono_io.cpp index b6004bb6..6be91047 100644 --- a/beast/chrono/impl/chrono_io.cpp +++ b/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/beast/chrono/manual_clock.h b/beast/chrono/manual_clock.h index 8342c7d4..24dd9ddd 100644 --- a/beast/chrono/manual_clock.h +++ b/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/beast/chrono/tests/abstract_clock.test.cpp b/beast/chrono/tests/abstract_clock.test.cpp index e8492527..5bf4493a 100644 --- a/beast/chrono/tests/abstract_clock.test.cpp +++ b/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/beast/chrono/tests/basic_seconds_clock.test.cpp b/beast/chrono/tests/basic_seconds_clock.test.cpp index e8e9c58d..6678d638 100644 --- a/beast/chrono/tests/basic_seconds_clock.test.cpp +++ b/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/beast/config/CompilerConfig.h b/beast/config/CompilerConfig.h index 1a279e6f..7eb0e83d 100644 --- a/beast/config/CompilerConfig.h +++ b/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/beast/config/StandardConfig.h b/beast/config/StandardConfig.h index f620563c..c2cb0cc1 100644 --- a/beast/config/StandardConfig.h +++ b/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/beast/config/compiler/VisualC.h b/beast/config/compiler/VisualC.h index 8f0b308e..b4e1c05b 100644 --- a/beast/config/compiler/VisualC.h +++ b/beast/config/compiler/VisualC.h @@ -19,4 +19,4 @@ // Microsoft Visual C++ compiler configuration -#include "../../utility/noexcept.h" +#include diff --git a/beast/container/Container.unity.cpp b/beast/container/Container.unity.cpp index d8eac03c..994129df 100644 --- a/beast/container/Container.unity.cpp +++ b/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/beast/container/aged_container_utility.h b/beast/container/aged_container_utility.h index 317f833d..9ba44c61 100644 --- a/beast/container/aged_container_utility.h +++ b/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/beast/container/aged_map.h b/beast/container/aged_map.h index 6475e853..f9d0470f 100644 --- a/beast/container/aged_map.h +++ b/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/beast/container/aged_multimap.h b/beast/container/aged_multimap.h index 58a060dc..c66ff227 100644 --- a/beast/container/aged_multimap.h +++ b/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/beast/container/aged_multiset.h b/beast/container/aged_multiset.h index ce420977..620270d2 100644 --- a/beast/container/aged_multiset.h +++ b/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/beast/container/aged_set.h b/beast/container/aged_set.h index db69158b..a5ef922d 100644 --- a/beast/container/aged_set.h +++ b/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/beast/container/aged_unordered_map.h b/beast/container/aged_unordered_map.h index 909a1c7f..b6031bc9 100644 --- a/beast/container/aged_unordered_map.h +++ b/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/beast/container/aged_unordered_multimap.h b/beast/container/aged_unordered_multimap.h index b3270d81..75123929 100644 --- a/beast/container/aged_unordered_multimap.h +++ b/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/beast/container/aged_unordered_multiset.h b/beast/container/aged_unordered_multiset.h index b121ad9b..c1f3ef35 100644 --- a/beast/container/aged_unordered_multiset.h +++ b/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/beast/container/aged_unordered_set.h b/beast/container/aged_unordered_set.h index 8c9090b4..83b37de0 100644 --- a/beast/container/aged_unordered_set.h +++ b/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/beast/container/buffer_view.h b/beast/container/buffer_view.h index 1336b69e..f6cc9f63 100644 --- a/beast/container/buffer_view.h +++ b/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/beast/container/detail/aged_ordered_container.h b/beast/container/detail/aged_ordered_container.h index dd77b28e..c248252c 100644 --- a/beast/container/detail/aged_ordered_container.h +++ b/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/beast/container/detail/aged_unordered_container.h b/beast/container/detail/aged_unordered_container.h index 5a1054fe..deaf741b 100644 --- a/beast/container/detail/aged_unordered_container.h +++ b/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/beast/container/hardened_hash.h b/beast/container/hardened_hash.h index df419aaf..2c632d06 100644 --- a/beast/container/hardened_hash.h +++ b/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/beast/container/hash_append.h b/beast/container/hash_append.h index 1843911c..6f94c5c3 100644 --- a/beast/container/hash_append.h +++ b/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/beast/container/impl/spookyv2.cpp b/beast/container/impl/spookyv2.cpp index b6d44488..11e8220e 100644 --- a/beast/container/impl/spookyv2.cpp +++ b/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/beast/container/impl/spookyv2.h b/beast/container/impl/spookyv2.h index 9e3b56c0..15ae43a6 100644 --- a/beast/container/impl/spookyv2.h +++ b/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/beast/container/tests/aged_associative_container.test.cpp b/beast/container/tests/aged_associative_container.test.cpp index 7c410fcf..828baeb0 100644 --- a/beast/container/tests/aged_associative_container.test.cpp +++ b/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/beast/container/tests/buffer_view.test.cpp b/beast/container/tests/buffer_view.test.cpp index 743430cb..d61f276f 100644 --- a/beast/container/tests/buffer_view.test.cpp +++ b/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/beast/container/tests/hardened_hash.test.cpp b/beast/container/tests/hardened_hash.test.cpp index a3f2d1a2..f60f18be 100644 --- a/beast/container/tests/hardened_hash.test.cpp +++ b/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/beast/container/tests/hash_append.test.cpp b/beast/container/tests/hash_append.test.cpp index c102fcd1..dacff5aa 100644 --- a/beast/container/tests/hash_append.test.cpp +++ b/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/beast/crypto/Crypto.unity.cpp b/beast/crypto/Crypto.unity.cpp index 206776e6..7c158fcb 100644 --- a/beast/crypto/Crypto.unity.cpp +++ b/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/beast/crypto/Sha256.h b/beast/crypto/Sha256.h index c415ac06..538a3a01 100644 --- a/beast/crypto/Sha256.h +++ b/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/beast/crypto/UnsignedInteger.h b/beast/crypto/UnsignedInteger.h index e20badab..99346be6 100644 --- a/beast/crypto/UnsignedInteger.h +++ b/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/beast/crypto/UnsignedIntegerCalc.h b/beast/crypto/UnsignedIntegerCalc.h index d4e1b8ac..53c88381 100644 --- a/beast/crypto/UnsignedIntegerCalc.h +++ b/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/beast/crypto/impl/MurmurHash.cpp b/beast/crypto/impl/MurmurHash.cpp index 4b92e563..3063b15a 100644 --- a/beast/crypto/impl/MurmurHash.cpp +++ b/beast/crypto/impl/MurmurHash.cpp @@ -19,7 +19,7 @@ // http://code.google.com/p/smhasher/ -#include "../MurmurHash.h" +#include #include diff --git a/beast/crypto/impl/Sha256.cpp b/beast/crypto/impl/Sha256.cpp index 4fec4b76..0427120c 100644 --- a/beast/crypto/impl/Sha256.cpp +++ b/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/beast/crypto/impl/UnsignedInteger.cpp b/beast/crypto/impl/UnsignedInteger.cpp index a35bb2d5..a2b36da3 100644 --- a/beast/crypto/impl/UnsignedInteger.cpp +++ b/beast/crypto/impl/UnsignedInteger.cpp @@ -20,9 +20,9 @@ */ //============================================================================== -#include "../UnsignedInteger.h" +#include -#include "../../unit_test/suite.h" +#include namespace beast { diff --git a/beast/crypto/tests/BinaryEncoding.cpp b/beast/crypto/tests/BinaryEncoding.cpp index 69e611e7..24578142 100644 --- a/beast/crypto/tests/BinaryEncoding.cpp +++ b/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/beast/crypto/tests/UnsignedInteger.test.cpp b/beast/crypto/tests/UnsignedInteger.test.cpp index 2263e61e..173b8892 100644 --- a/beast/crypto/tests/UnsignedInteger.test.cpp +++ b/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/beast/cxx14/algorithm.h b/beast/cxx14/algorithm.h index f10bd7bb..49e906c4 100644 --- a/beast/cxx14/algorithm.h +++ b/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/beast/cxx14/cxx14.unity.cpp b/beast/cxx14/cxx14.unity.cpp index 592b7448..1fbfe8eb 100644 --- a/beast/cxx14/cxx14.unity.cpp +++ b/beast/cxx14/cxx14.unity.cpp @@ -17,4 +17,4 @@ */ //============================================================================== -#include "tests/integer_sequence.test.cpp" +#include diff --git a/beast/cxx14/functional.h b/beast/cxx14/functional.h index 35946b88..f1e217f0 100644 --- a/beast/cxx14/functional.h +++ b/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/beast/cxx14/iterator.h b/beast/cxx14/iterator.h index e242997d..ee02471c 100644 --- a/beast/cxx14/iterator.h +++ b/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/beast/cxx14/memory.h b/beast/cxx14/memory.h index 38430cd2..d229000b 100644 --- a/beast/cxx14/memory.h +++ b/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/beast/cxx14/tests/integer_sequence.test.cpp b/beast/cxx14/tests/integer_sequence.test.cpp index f7360baa..77d4eafd 100644 --- a/beast/cxx14/tests/integer_sequence.test.cpp +++ b/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/beast/cxx14/type_traits.h b/beast/cxx14/type_traits.h index cc86df93..30f8b692 100644 --- a/beast/cxx14/type_traits.h +++ b/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/beast/cxx14/utility.h b/beast/cxx14/utility.h index 80afe8d6..fa882c2a 100644 --- a/beast/cxx14/utility.h +++ b/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/beast/http/HTTP.unity.cpp b/beast/http/HTTP.unity.cpp index e6f397c9..6230dc44 100644 --- a/beast/http/HTTP.unity.cpp +++ b/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/beast/http/ParsedURL.h b/beast/http/ParsedURL.h index 69ca4a07..a2ba305e 100644 --- a/beast/http/ParsedURL.h +++ b/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/beast/http/URL.h b/beast/http/URL.h index 1e0e114c..c8bdfb3d 100644 --- a/beast/http/URL.h +++ b/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/beast/http/basic_url.h b/beast/http/basic_url.h index 7dabc896..f5593fee 100644 --- a/beast/http/basic_url.h +++ b/beast/http/basic_url.h @@ -23,7 +23,7 @@ #include #include -#include "../utility/noexcept.h" +#include #include #include #include diff --git a/beast/http/client_session.h b/beast/http/client_session.h index 709a86f6..633ea03a 100644 --- a/beast/http/client_session.h +++ b/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/beast/http/detail/header_traits.h b/beast/http/detail/header_traits.h index 4284dca3..c1f09f5d 100644 --- a/beast/http/detail/header_traits.h +++ b/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/beast/http/impl/ParsedURL.cpp b/beast/http/impl/ParsedURL.cpp index f889f398..1bba0140 100644 --- a/beast/http/impl/ParsedURL.cpp +++ b/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/beast/http/impl/URL.cpp b/beast/http/impl/URL.cpp index 4aa3810e..d1e772eb 100644 --- a/beast/http/impl/URL.cpp +++ b/beast/http/impl/URL.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../URL.h" +#include namespace beast { diff --git a/beast/http/impl/basic_url.cpp b/beast/http/impl/basic_url.cpp index 0afdb1c6..a05bfa43 100644 --- a/beast/http/impl/basic_url.cpp +++ b/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/beast/http/impl/get.cpp b/beast/http/impl/get.cpp index 4318fbae..30797421 100644 --- a/beast/http/impl/get.cpp +++ b/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/beast/http/impl/joyent_parser.cpp b/beast/http/impl/joyent_parser.cpp index 40448b5a..e58e0f60 100644 --- a/beast/http/impl/joyent_parser.cpp +++ b/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/beast/http/impl/joyent_parser.h b/beast/http/impl/joyent_parser.h index e65baeb8..cdd309ca 100644 --- a/beast/http/impl/joyent_parser.h +++ b/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/beast/http/impl/raw_parser.cpp b/beast/http/impl/raw_parser.cpp index cecf1d84..340a777c 100644 --- a/beast/http/impl/raw_parser.cpp +++ b/beast/http/impl/raw_parser.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include "../raw_parser.h" +#include -#include "joyent_parser.h" +#include #include diff --git a/beast/http/raw_parser.h b/beast/http/raw_parser.h index 69c4dfda..cc87d07a 100644 --- a/beast/http/raw_parser.h +++ b/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/beast/http/tests/ParsedURL.cpp b/beast/http/tests/ParsedURL.cpp index ca236210..8e2fe02e 100644 --- a/beast/http/tests/ParsedURL.cpp +++ b/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/beast/http/tests/basic_message.test.cpp b/beast/http/tests/basic_message.test.cpp index 15ecb028..ebc03612 100644 --- a/beast/http/tests/basic_message.test.cpp +++ b/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/beast/http/tests/basic_url.test.cpp b/beast/http/tests/basic_url.test.cpp index 24e6c24c..d077663b 100644 --- a/beast/http/tests/basic_url.test.cpp +++ b/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/beast/http/tests/client_session.test.cpp b/beast/http/tests/client_session.test.cpp index 044d692d..85b11020 100644 --- a/beast/http/tests/client_session.test.cpp +++ b/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/beast/http/tests/urls_large_data.cpp b/beast/http/tests/urls_large_data.cpp index 07940651..2a870a31 100644 --- a/beast/http/tests/urls_large_data.cpp +++ b/beast/http/tests/urls_large_data.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "urls_large_data.h" +#include namespace beast { namespace http { diff --git a/beast/insight/Collector.h b/beast/insight/Collector.h index 6325ad37..3b72174d 100644 --- a/beast/insight/Collector.h +++ b/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/beast/insight/Counter.h b/beast/insight/Counter.h index 2da42226..8086bc58 100644 --- a/beast/insight/Counter.h +++ b/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/beast/insight/CounterImpl.h b/beast/insight/CounterImpl.h index 61f15050..3bc11f96 100644 --- a/beast/insight/CounterImpl.h +++ b/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/beast/insight/Event.h b/beast/insight/Event.h index 52189a50..c3a166f0 100644 --- a/beast/insight/Event.h +++ b/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/beast/insight/EventImpl.h b/beast/insight/EventImpl.h index 4113d59d..7611b298 100644 --- a/beast/insight/EventImpl.h +++ b/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/beast/insight/Gauge.h b/beast/insight/Gauge.h index d02a68d3..3c296f09 100644 --- a/beast/insight/Gauge.h +++ b/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/beast/insight/GaugeImpl.h b/beast/insight/GaugeImpl.h index 081c534b..9d19a567 100644 --- a/beast/insight/GaugeImpl.h +++ b/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/beast/insight/Group.h b/beast/insight/Group.h index f47c72a2..858f8c3b 100644 --- a/beast/insight/Group.h +++ b/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/beast/insight/Groups.h b/beast/insight/Groups.h index be4f2976..4321869d 100644 --- a/beast/insight/Groups.h +++ b/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/beast/insight/Hook.h b/beast/insight/Hook.h index 696fe681..1940189f 100644 --- a/beast/insight/Hook.h +++ b/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/beast/insight/HookImpl.h b/beast/insight/HookImpl.h index 78ecb0e4..4b9ab720 100644 --- a/beast/insight/HookImpl.h +++ b/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/beast/insight/Insight.unity.cpp b/beast/insight/Insight.unity.cpp index 5ab9a4df..5439b2f7 100644 --- a/beast/insight/Insight.unity.cpp +++ b/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/beast/insight/Meter.h b/beast/insight/Meter.h index 2cf3d38e..b8cde62a 100644 --- a/beast/insight/Meter.h +++ b/beast/insight/Meter.h @@ -22,8 +22,8 @@ #include -#include "Base.h" -#include "MeterImpl.h" +#include +#include namespace beast { namespace insight { diff --git a/beast/insight/MeterImpl.h b/beast/insight/MeterImpl.h index 301f86e6..de354722 100644 --- a/beast/insight/MeterImpl.h +++ b/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/beast/insight/NullCollector.h b/beast/insight/NullCollector.h index d0b117b2..617b71bf 100644 --- a/beast/insight/NullCollector.h +++ b/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/beast/insight/StatsDCollector.h b/beast/insight/StatsDCollector.h index ea5bf61e..c078921e 100644 --- a/beast/insight/StatsDCollector.h +++ b/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/beast/insight/impl/Groups.cpp b/beast/insight/impl/Groups.cpp index a20728cc..430052d9 100644 --- a/beast/insight/impl/Groups.cpp +++ b/beast/insight/impl/Groups.cpp @@ -19,7 +19,7 @@ #include -#include "../../cxx14/memory.h" +#include namespace beast { namespace insight { diff --git a/beast/insight/impl/StatsDCollector.cpp b/beast/insight/impl/StatsDCollector.cpp index cc547693..8d1b1d78 100644 --- a/beast/insight/impl/StatsDCollector.cpp +++ b/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/beast/intrusive/List.h b/beast/intrusive/List.h index 50702a1a..3f4e01aa 100644 --- a/beast/intrusive/List.h +++ b/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/beast/intrusive/LockFreeStack.h b/beast/intrusive/LockFreeStack.h index c4452bec..519ca803 100644 --- a/beast/intrusive/LockFreeStack.h +++ b/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/beast/net/IPAddress.h b/beast/net/IPAddress.h index 2303c62e..41ce4d1f 100644 --- a/beast/net/IPAddress.h +++ b/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/beast/net/IPAddressV4.h b/beast/net/IPAddressV4.h index 41e405fe..ebb3a974 100644 --- a/beast/net/IPAddressV4.h +++ b/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/beast/net/IPEndpoint.h b/beast/net/IPEndpoint.h index 193881f7..41a147f5 100644 --- a/beast/net/IPEndpoint.h +++ b/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/beast/net/Net.unity.cpp b/beast/net/Net.unity.cpp index d65e14aa..eec68a83 100644 --- a/beast/net/Net.unity.cpp +++ b/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/beast/net/impl/DynamicBuffer.cpp b/beast/net/impl/DynamicBuffer.cpp index 459c2231..dc9d26cd 100644 --- a/beast/net/impl/DynamicBuffer.cpp +++ b/beast/net/impl/DynamicBuffer.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" #endif -#include "../DynamicBuffer.h" +#include #include #include diff --git a/beast/net/impl/IPAddressV4.cpp b/beast/net/impl/IPAddressV4.cpp index da2bf7f6..69f08cce 100644 --- a/beast/net/impl/IPAddressV4.cpp +++ b/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/beast/net/impl/IPAddressV6.cpp b/beast/net/impl/IPAddressV6.cpp index f079875d..62f72b9f 100644 --- a/beast/net/impl/IPAddressV6.cpp +++ b/beast/net/impl/IPAddressV6.cpp @@ -21,7 +21,7 @@ #include "../../BeastConfig.h" #endif -#include "../IPAddressV6.h" +#include namespace beast { namespace IP { diff --git a/beast/net/impl/IPEndpoint.cpp b/beast/net/impl/IPEndpoint.cpp index f401c315..1f074923 100644 --- a/beast/net/impl/IPEndpoint.cpp +++ b/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/beast/net/tests/IPEndpoint.test.cpp b/beast/net/tests/IPEndpoint.test.cpp index e32784d2..748a92cb 100644 --- a/beast/net/tests/IPEndpoint.test.cpp +++ b/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/beast/smart_ptr/ScopedPointer.h b/beast/smart_ptr/ScopedPointer.h index 3e1cf791..aa3bd0ed 100644 --- a/beast/smart_ptr/ScopedPointer.h +++ b/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/beast/smart_ptr/SharedObject.h b/beast/smart_ptr/SharedObject.h index fa0d5ad7..1ceca91d 100644 --- a/beast/smart_ptr/SharedObject.h +++ b/beast/smart_ptr/SharedObject.h @@ -26,8 +26,8 @@ #include -#include "../Config.h" -#include "../Uncopyable.h" +#include +#include namespace beast { diff --git a/beast/smart_ptr/SharedPtr.h b/beast/smart_ptr/SharedPtr.h index 36370897..e1c5f70d 100644 --- a/beast/smart_ptr/SharedPtr.h +++ b/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/beast/streams/abstract_ostream.h b/beast/streams/abstract_ostream.h index 2063f219..6ff13073 100644 --- a/beast/streams/abstract_ostream.h +++ b/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/beast/streams/basic_abstract_ostream.h b/beast/streams/basic_abstract_ostream.h index a3ff5e3f..7d1932a5 100644 --- a/beast/streams/basic_abstract_ostream.h +++ b/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/beast/streams/basic_scoped_ostream.h b/beast/streams/basic_scoped_ostream.h index d1a001ad..861cf012 100644 --- a/beast/streams/basic_scoped_ostream.h +++ b/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/beast/streams/basic_std_ostream.h b/beast/streams/basic_std_ostream.h index 677eb39b..b8933fa1 100644 --- a/beast/streams/basic_std_ostream.h +++ b/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/beast/streams/debug_ostream.h b/beast/streams/debug_ostream.h index d9f12ea1..6e23d22a 100644 --- a/beast/streams/debug_ostream.h +++ b/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/beast/streams/streams.unity.cpp b/beast/streams/streams.unity.cpp index a9574159..f9978945 100644 --- a/beast/streams/streams.unity.cpp +++ b/beast/streams/streams.unity.cpp @@ -17,4 +17,4 @@ */ //============================================================================== -#include "tests/basic_abstract_ostream.test.cpp" +#include diff --git a/beast/streams/tests/basic_abstract_ostream.test.cpp b/beast/streams/tests/basic_abstract_ostream.test.cpp index 1ef7687a..df2ea3c0 100644 --- a/beast/streams/tests/basic_abstract_ostream.test.cpp +++ b/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/beast/strings/CharPointer_ASCII.h b/beast/strings/CharPointer_ASCII.h index 48e96bb4..a61c171c 100644 --- a/beast/strings/CharPointer_ASCII.h +++ b/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/beast/strings/CharPointer_UTF16.h b/beast/strings/CharPointer_UTF16.h index 987989cb..c0afdfbe 100644 --- a/beast/strings/CharPointer_UTF16.h +++ b/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/beast/strings/CharPointer_UTF32.h b/beast/strings/CharPointer_UTF32.h index 37ab304c..3bf0b440 100644 --- a/beast/strings/CharPointer_UTF32.h +++ b/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/beast/strings/CharPointer_UTF8.h b/beast/strings/CharPointer_UTF8.h index ac9f709e..d5e83fc0 100644 --- a/beast/strings/CharPointer_UTF8.h +++ b/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/beast/strings/CharacterFunctions.h b/beast/strings/CharacterFunctions.h index d05bcdd6..b3037e24 100644 --- a/beast/strings/CharacterFunctions.h +++ b/beast/strings/CharacterFunctions.h @@ -26,8 +26,8 @@ #include -#include "../Config.h" -#include "../Memory.h" +#include +#include #include diff --git a/beast/strings/NewLine.h b/beast/strings/NewLine.h index 1566402d..ba9c0f5d 100644 --- a/beast/strings/NewLine.h +++ b/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/beast/strings/String.h b/beast/strings/String.h index b49ad06e..89249108 100644 --- a/beast/strings/String.h +++ b/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/beast/strings/StringCharPointerType.h b/beast/strings/StringCharPointerType.h index ef2de5ec..ec9f4573 100644 --- a/beast/strings/StringCharPointerType.h +++ b/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/beast/strings/StringFromNumber.h b/beast/strings/StringFromNumber.h index 21d8438b..31ccb55a 100644 --- a/beast/strings/StringFromNumber.h +++ b/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/beast/strings/Strings.unity.cpp b/beast/strings/Strings.unity.cpp index 15f2ddad..9ded492c 100644 --- a/beast/strings/Strings.unity.cpp +++ b/beast/strings/Strings.unity.cpp @@ -17,5 +17,5 @@ */ //============================================================================== -#include "impl/CharacterFunctions.cpp" -#include "impl/String.cpp" +#include +#include diff --git a/beast/strings/impl/CharacterFunctions.cpp b/beast/strings/impl/CharacterFunctions.cpp index 51210569..313230d5 100644 --- a/beast/strings/impl/CharacterFunctions.cpp +++ b/beast/strings/impl/CharacterFunctions.cpp @@ -25,7 +25,7 @@ #include "../../BeastConfig.h" #endif -#include "../CharacterFunctions.h" +#include #include #include diff --git a/beast/strings/impl/String.cpp b/beast/strings/impl/String.cpp index a9e19a44..451e05ac 100644 --- a/beast/strings/impl/String.cpp +++ b/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/beast/threads/RecursiveMutex.h b/beast/threads/RecursiveMutex.h index 3f7cb59a..129377cf 100644 --- a/beast/threads/RecursiveMutex.h +++ b/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/beast/threads/ServiceQueue.h b/beast/threads/ServiceQueue.h index eac6d6cf..3d0e6042 100644 --- a/beast/threads/ServiceQueue.h +++ b/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/beast/threads/SharedData.h b/beast/threads/SharedData.h index 62e1defe..707b98de 100644 --- a/beast/threads/SharedData.h +++ b/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/beast/threads/SharedLockGuard.h b/beast/threads/SharedLockGuard.h index 82fdbd08..da9f6b75 100644 --- a/beast/threads/SharedLockGuard.h +++ b/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/beast/threads/SharedMutexAdapter.h b/beast/threads/SharedMutexAdapter.h index 8147dc3a..4cf3f03e 100644 --- a/beast/threads/SharedMutexAdapter.h +++ b/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/beast/threads/SpinLock.h b/beast/threads/SpinLock.h index 4750911e..717ec2ce 100644 --- a/beast/threads/SpinLock.h +++ b/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/beast/threads/Stoppable.h b/beast/threads/Stoppable.h index 9ff21dcb..19ce3443 100644 --- a/beast/threads/Stoppable.h +++ b/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/beast/threads/Thread.h b/beast/threads/Thread.h index aee57d5f..92443943 100644 --- a/beast/threads/Thread.h +++ b/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/beast/threads/ThreadLocalValue.h b/beast/threads/ThreadLocalValue.h index ac8310cd..99bb024e 100644 --- a/beast/threads/ThreadLocalValue.h +++ b/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/beast/threads/Threads.unity.cpp b/beast/threads/Threads.unity.cpp index 93352697..104f9ba5 100644 --- a/beast/threads/Threads.unity.cpp +++ b/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/beast/threads/TryLockGuard.h b/beast/threads/TryLockGuard.h index f61f8bb6..55afdae3 100644 --- a/beast/threads/TryLockGuard.h +++ b/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/beast/threads/UnlockGuard.h b/beast/threads/UnlockGuard.h index ea412765..d8f7b590 100644 --- a/beast/threads/UnlockGuard.h +++ b/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/beast/threads/WaitableEvent.h b/beast/threads/WaitableEvent.h index 1e8b2a2c..b78289a0 100644 --- a/beast/threads/WaitableEvent.h +++ b/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/beast/threads/detail/DispatchedHandler.h b/beast/threads/detail/DispatchedHandler.h index 8cd1897e..b84e4657 100644 --- a/beast/threads/detail/DispatchedHandler.h +++ b/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/beast/threads/impl/RecursiveMutex.cpp b/beast/threads/impl/RecursiveMutex.cpp index 414f883c..b5005184 100644 --- a/beast/threads/impl/RecursiveMutex.cpp +++ b/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/beast/threads/impl/ServiceQueue.cpp b/beast/threads/impl/ServiceQueue.cpp index 0b284e35..44a662da 100644 --- a/beast/threads/impl/ServiceQueue.cpp +++ b/beast/threads/impl/ServiceQueue.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../ServiceQueue.h" +#include namespace beast { diff --git a/beast/threads/impl/Stoppable.cpp b/beast/threads/impl/Stoppable.cpp index 7c8eb891..f5a9fe8e 100644 --- a/beast/threads/impl/Stoppable.cpp +++ b/beast/threads/impl/Stoppable.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../Stoppable.h" +#include namespace beast { diff --git a/beast/threads/impl/Thread.cpp b/beast/threads/impl/Thread.cpp index a9f0f8f5..88863e88 100644 --- a/beast/threads/impl/Thread.cpp +++ b/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/beast/threads/impl/WaitableEvent.cpp b/beast/threads/impl/WaitableEvent.cpp index 9e882c49..05b85507 100644 --- a/beast/threads/impl/WaitableEvent.cpp +++ b/beast/threads/impl/WaitableEvent.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../WaitableEvent.h" +#include #if BEAST_WINDOWS diff --git a/beast/threads/tests/Atomic.test.cpp b/beast/threads/tests/Atomic.test.cpp index f6e76406..c1e7cdd6 100644 --- a/beast/threads/tests/Atomic.test.cpp +++ b/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/beast/threads/tests/ServiceQueue.cpp b/beast/threads/tests/ServiceQueue.cpp index 9893aa44..cbd12a4b 100644 --- a/beast/threads/tests/ServiceQueue.cpp +++ b/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/beast/unit_test.h b/beast/unit_test.h index 81764936..2c99801d 100644 --- a/beast/unit_test.h +++ b/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/beast/unit_test/define_print.cpp b/beast/unit_test/define_print.cpp index 47770109..00194879 100644 --- a/beast/unit_test/define_print.cpp +++ b/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/beast/unit_test/global_suites.h b/beast/unit_test/global_suites.h index 8fd39d5d..eb61b9b6 100644 --- a/beast/unit_test/global_suites.h +++ b/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/beast/unit_test/match.h b/beast/unit_test/match.h index ad0d1f07..763c1ac6 100644 --- a/beast/unit_test/match.h +++ b/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/beast/unit_test/print.h b/beast/unit_test/print.h index b4cd355e..db36c9f4 100644 --- a/beast/unit_test/print.h +++ b/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/beast/unit_test/recorder.h b/beast/unit_test/recorder.h index 565167e7..153f8f17 100644 --- a/beast/unit_test/recorder.h +++ b/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/beast/unit_test/reporter.h b/beast/unit_test/reporter.h index ac2937ee..c206ac47 100644 --- a/beast/unit_test/reporter.h +++ b/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/beast/unit_test/results.h b/beast/unit_test/results.h index 6dcecd84..d19687d0 100644 --- a/beast/unit_test/results.h +++ b/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/beast/unit_test/runner.h b/beast/unit_test/runner.h index d2b55e75..d4499f3e 100644 --- a/beast/unit_test/runner.h +++ b/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/beast/unit_test/suite.h b/beast/unit_test/suite.h index 1bd157be..e905fb56 100644 --- a/beast/unit_test/suite.h +++ b/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/beast/unit_test/suite_list.h b/beast/unit_test/suite_list.h index 3cc534fc..6194e93f 100644 --- a/beast/unit_test/suite_list.h +++ b/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/beast/unit_test/tests/main.cpp b/beast/unit_test/tests/main.cpp index 340b44bf..589012a9 100644 --- a/beast/unit_test/tests/main.cpp +++ b/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/beast/utility/Debug.h b/beast/utility/Debug.h index 0a1d5e3e..c1b0616a 100644 --- a/beast/utility/Debug.h +++ b/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/beast/utility/Error.h b/beast/utility/Error.h index 0c095bfc..2081eb8a 100644 --- a/beast/utility/Error.h +++ b/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/beast/utility/LeakChecked.h b/beast/utility/LeakChecked.h index 296d315e..caf791c1 100644 --- a/beast/utility/LeakChecked.h +++ b/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/beast/utility/PropertyStream.h b/beast/utility/PropertyStream.h index 480b8db4..f42dcf8e 100644 --- a/beast/utility/PropertyStream.h +++ b/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/beast/utility/Utility.unity.cpp b/beast/utility/Utility.unity.cpp index a05169f9..0b6cbe79 100644 --- a/beast/utility/Utility.unity.cpp +++ b/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/beast/utility/Zero.h b/beast/utility/Zero.h index 0cd1c950..c09c1832 100644 --- a/beast/utility/Zero.h +++ b/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/beast/utility/empty_base_optimization.h b/beast/utility/empty_base_optimization.h index 2989f098..4ab904b4 100644 --- a/beast/utility/empty_base_optimization.h +++ b/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/beast/utility/impl/Debug.cpp b/beast/utility/impl/Debug.cpp index 0e27385e..69e28dfd 100644 --- a/beast/utility/impl/Debug.cpp +++ b/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/beast/utility/impl/Error.cpp b/beast/utility/impl/Error.cpp index 7751c417..021a4b83 100644 --- a/beast/utility/impl/Error.cpp +++ b/beast/utility/impl/Error.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../Error.h" -#include "../Debug.h" +#include +#include #include diff --git a/beast/utility/impl/Journal.cpp b/beast/utility/impl/Journal.cpp index 932ae6b7..7bb261e5 100644 --- a/beast/utility/impl/Journal.cpp +++ b/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/beast/utility/impl/LeakChecked.cpp b/beast/utility/impl/LeakChecked.cpp index 3ac4e520..4c9bae19 100644 --- a/beast/utility/impl/LeakChecked.cpp +++ b/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/beast/utility/impl/PropertyStream.cpp b/beast/utility/impl/PropertyStream.cpp index 7ea88bb3..a0c3ec19 100644 --- a/beast/utility/impl/PropertyStream.cpp +++ b/beast/utility/impl/PropertyStream.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../PropertyStream.h" -#include "../../unit_test/suite.h" +#include +#include #include #include diff --git a/beast/utility/impl/StaticObject.cpp b/beast/utility/impl/StaticObject.cpp index 5b44bb0d..ae7a10c9 100644 --- a/beast/utility/impl/StaticObject.cpp +++ b/beast/utility/impl/StaticObject.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include "../StaticObject.h" -#include "../../threads/Thread.h" +#include +#include namespace beast { diff --git a/beast/utility/is_call_possible.h b/beast/utility/is_call_possible.h index 099c9fcc..182eb11c 100644 --- a/beast/utility/is_call_possible.h +++ b/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/beast/utility/tagged_integer.h b/beast/utility/tagged_integer.h index e4c3d8c8..39a43def 100644 --- a/beast/utility/tagged_integer.h +++ b/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/beast/utility/tests/Zero.test.cpp b/beast/utility/tests/Zero.test.cpp index d40282d7..64cd0c41 100644 --- a/beast/utility/tests/Zero.test.cpp +++ b/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/beast/utility/tests/bassert.test.cpp b/beast/utility/tests/bassert.test.cpp index 2da5c702..ef67667a 100644 --- a/beast/utility/tests/bassert.test.cpp +++ b/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/beast/utility/tests/empty_base_optimization.test.cpp b/beast/utility/tests/empty_base_optimization.test.cpp index 1a72c2ae..10808df5 100644 --- a/beast/utility/tests/empty_base_optimization.test.cpp +++ b/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/beast/utility/tests/tagged_integer.test.cpp b/beast/utility/tests/tagged_integer.test.cpp index 4e0a383f..a8b7e611 100644 --- a/beast/utility/tests/tagged_integer.test.cpp +++ b/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/beast/utility/type_name.h b/beast/utility/type_name.h index 3e02fdfe..fadf8d90 100644 --- a/beast/utility/type_name.h +++ b/beast/utility/type_name.h @@ -24,7 +24,7 @@ #include #include #ifndef _MSC_VER -# include +#include #endif #include #include diff --git a/modules/beast_asio/basics/FixedInputBuffer.h b/modules/beast_asio/basics/FixedInputBuffer.h index 44da38a5..c260dc0e 100644 --- a/modules/beast_asio/basics/FixedInputBuffer.h +++ b/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/modules/beast_asio/beast_asio.h b/modules/beast_asio/beast_asio.h index 80429b5d..3d8e2cd2 100644 --- a/modules/beast_asio/beast_asio.h +++ b/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/modules/beast_asio/beast_asio.unity.cpp b/modules/beast_asio/beast_asio.unity.cpp index 6c95da66..aa4fc556 100644 --- a/modules/beast_asio/beast_asio.unity.cpp +++ b/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/modules/beast_asio/http/HTTPClientType.cpp b/modules/beast_asio/http/HTTPClientType.cpp index 8dc68fee..2527d372 100644 --- a/modules/beast_asio/http/HTTPClientType.cpp +++ b/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/modules/beast_asio/http/HTTPClientType.h b/modules/beast_asio/http/HTTPClientType.h index d256afe3..aac69eff 100644 --- a/modules/beast_asio/http/HTTPClientType.h +++ b/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/modules/beast_asio/http/HTTPField.h b/modules/beast_asio/http/HTTPField.h index 9671de6a..257b65c7 100644 --- a/modules/beast_asio/http/HTTPField.h +++ b/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/modules/beast_asio/http/HTTPHeaders.h b/modules/beast_asio/http/HTTPHeaders.h index e3360327..8b5d74aa 100644 --- a/modules/beast_asio/http/HTTPHeaders.h +++ b/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/modules/beast_asio/http/HTTPMessage.h b/modules/beast_asio/http/HTTPMessage.h index 588b830c..bafdb630 100644 --- a/modules/beast_asio/http/HTTPMessage.h +++ b/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/modules/beast_asio/http/HTTPParser.h b/modules/beast_asio/http/HTTPParser.h index 791f981b..9ef09177 100644 --- a/modules/beast_asio/http/HTTPParser.h +++ b/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/modules/beast_asio/http/HTTPRequest.h b/modules/beast_asio/http/HTTPRequest.h index ee3d9db9..36b4dcc5 100644 --- a/modules/beast_asio/http/HTTPRequest.h +++ b/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/modules/beast_asio/http/HTTPRequestParser.h b/modules/beast_asio/http/HTTPRequestParser.h index 00cda413..ef370e3d 100644 --- a/modules/beast_asio/http/HTTPRequestParser.h +++ b/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/modules/beast_asio/http/HTTPResponseParser.h b/modules/beast_asio/http/HTTPResponseParser.h index 422c9f0b..eee6d1d2 100644 --- a/modules/beast_asio/http/HTTPResponseParser.h +++ b/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/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h b/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h index 329232e8..1593b328 100644 --- a/modules/beast_asio/protocol/HandshakeDetectLogicPROXY.h +++ b/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/modules/beast_asio/protocol/HandshakeDetector.h b/modules/beast_asio/protocol/HandshakeDetector.h index 7b4be846..f4281a66 100644 --- a/modules/beast_asio/protocol/HandshakeDetector.h +++ b/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/modules/beast_asio/protocol/InputParser.h b/modules/beast_asio/protocol/InputParser.h index d6bb3e84..ae048ce3 100644 --- a/modules/beast_asio/protocol/InputParser.h +++ b/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/modules/beast_asio/protocol/PrefilledReadStream.h b/modules/beast_asio/protocol/PrefilledReadStream.h index 4d488f39..6bbb99d5 100644 --- a/modules/beast_asio/protocol/PrefilledReadStream.h +++ b/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/modules/beast_asio/system/BoostIncludes.h b/modules/beast_asio/system/BoostIncludes.h index 609041cb..72845101 100644 --- a/modules/beast_asio/system/BoostIncludes.h +++ b/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/modules/beast_asio/tests/PeerTest.h b/modules/beast_asio/tests/PeerTest.h index 6020db5d..48345b14 100644 --- a/modules/beast_asio/tests/PeerTest.h +++ b/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/modules/beast_asio/tests/TestPeerDetails.h b/modules/beast_asio/tests/TestPeerDetails.h index 18d4bd1a..7a4a79fe 100644 --- a/modules/beast_asio/tests/TestPeerDetails.h +++ b/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/modules/beast_asio/tests/TestPeerDetailsTcp.h b/modules/beast_asio/tests/TestPeerDetailsTcp.h index 2c4f576a..b72b9391 100644 --- a/modules/beast_asio/tests/TestPeerDetailsTcp.h +++ b/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/modules/beast_asio/tests/TestPeerUnitTests.cpp b/modules/beast_asio/tests/TestPeerUnitTests.cpp index 22dfc772..6c673efb 100644 --- a/modules/beast_asio/tests/TestPeerUnitTests.cpp +++ b/modules/beast_asio/tests/TestPeerUnitTests.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { namespace asio { diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h index ea57ea6a..d2db01f1 100644 --- a/modules/beast_core/beast_core.h +++ b/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/modules/beast_core/beast_core.unity.cpp b/modules/beast_core/beast_core.unity.cpp index 6c2c4cb7..f2741a5e 100644 --- a/modules/beast_core/beast_core.unity.cpp +++ b/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/modules/beast_core/containers/Array.h b/modules/beast_core/containers/Array.h index fb66292f..b458f5a4 100644 --- a/modules/beast_core/containers/Array.h +++ b/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/modules/beast_core/containers/ArrayAllocationBase.h b/modules/beast_core/containers/ArrayAllocationBase.h index 6fd4358a..874d4040 100644 --- a/modules/beast_core/containers/ArrayAllocationBase.h +++ b/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/modules/beast_core/diagnostic/FatalError.cpp b/modules/beast_core/diagnostic/FatalError.cpp index 6be4f2ce..539a4549 100644 --- a/modules/beast_core/diagnostic/FatalError.cpp +++ b/modules/beast_core/diagnostic/FatalError.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/diagnostic/SemanticVersion.cpp b/modules/beast_core/diagnostic/SemanticVersion.cpp index 732b74c7..92651d74 100644 --- a/modules/beast_core/diagnostic/SemanticVersion.cpp +++ b/modules/beast_core/diagnostic/SemanticVersion.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/files/File.cpp b/modules/beast_core/files/File.cpp index a8312b73..f613ba00 100644 --- a/modules/beast_core/files/File.cpp +++ b/modules/beast_core/files/File.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/files/File.h b/modules/beast_core/files/File.h index 01832eb9..03891714 100644 --- a/modules/beast_core/files/File.h +++ b/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/modules/beast_core/files/RandomAccessFile.cpp b/modules/beast_core/files/RandomAccessFile.cpp index 73a2e352..4d610ed1 100644 --- a/modules/beast_core/files/RandomAccessFile.cpp +++ b/modules/beast_core/files/RandomAccessFile.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/maths/Random.cpp b/modules/beast_core/maths/Random.cpp index 496c8fc9..86e23b1e 100644 --- a/modules/beast_core/maths/Random.cpp +++ b/modules/beast_core/maths/Random.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/memory/MemoryBlock.h b/modules/beast_core/memory/MemoryBlock.h index 7e365dfd..4364e221 100644 --- a/modules/beast_core/memory/MemoryBlock.h +++ b/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/modules/beast_core/memory/SharedSingleton.h b/modules/beast_core/memory/SharedSingleton.h index fca8841e..200b9a99 100644 --- a/modules/beast_core/memory/SharedSingleton.h +++ b/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/modules/beast_core/native/BasicNativeHeaders.h b/modules/beast_core/native/BasicNativeHeaders.h index e20e4fd0..b3f42dcb 100644 --- a/modules/beast_core/native/BasicNativeHeaders.h +++ b/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/modules/beast_core/system/BeforeBoost.h b/modules/beast_core/system/BeforeBoost.h index ce9c2bc5..fc7a8626 100644 --- a/modules/beast_core/system/BeforeBoost.h +++ b/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/modules/beast_core/system/FunctionalIncludes.h b/modules/beast_core/system/FunctionalIncludes.h index b7d4b370..bc042832 100644 --- a/modules/beast_core/system/FunctionalIncludes.h +++ b/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/modules/beast_core/text/LexicalCast.cpp b/modules/beast_core/text/LexicalCast.cpp index 09005298..a72b0961 100644 --- a/modules/beast_core/text/LexicalCast.cpp +++ b/modules/beast_core/text/LexicalCast.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/text/LexicalCast.h b/modules/beast_core/text/LexicalCast.h index 9315816c..ebaf5227 100644 --- a/modules/beast_core/text/LexicalCast.h +++ b/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/modules/beast_core/text/StringArray.h b/modules/beast_core/text/StringArray.h index 1957fe9b..526bcdce 100644 --- a/modules/beast_core/text/StringArray.h +++ b/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/modules/beast_core/text/StringPairArray.h b/modules/beast_core/text/StringPairArray.h index e9edce21..dd2f4b57 100644 --- a/modules/beast_core/text/StringPairArray.h +++ b/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/modules/beast_core/thread/Workers.cpp b/modules/beast_core/thread/Workers.cpp index 2c72f9be..b59b36a6 100644 --- a/modules/beast_core/thread/Workers.cpp +++ b/modules/beast_core/thread/Workers.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include "../../../beast/unit_test/suite.h" +#include namespace beast { diff --git a/modules/beast_core/thread/Workers.h b/modules/beast_core/thread/Workers.h index f20bc358..4e92138c 100644 --- a/modules/beast_core/thread/Workers.h +++ b/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/modules/beast_core/thread/detail/ScopedLock.h b/modules/beast_core/thread/detail/ScopedLock.h index f4a72d35..49289a27 100644 --- a/modules/beast_core/thread/detail/ScopedLock.h +++ b/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/modules/beast_core/threads/CriticalSection.h b/modules/beast_core/threads/CriticalSection.h index 1192764c..071b8922 100644 --- a/modules/beast_core/threads/CriticalSection.h +++ b/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/modules/beast_core/time/AtExitHook.h b/modules/beast_core/time/AtExitHook.h index 42ddbc55..91fdf85e 100644 --- a/modules/beast_core/time/AtExitHook.h +++ b/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/modules/beast_core/time/Time.h b/modules/beast_core/time/Time.h index d3c12b32..f8294a1f 100644 --- a/modules/beast_core/time/Time.h +++ b/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/modules/beast_sqdb/api/session.h b/modules/beast_sqdb/api/session.h index 56d04978..17b1dc71 100644 --- a/modules/beast_sqdb/api/session.h +++ b/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/modules/beast_sqdb/api/transaction.h b/modules/beast_sqdb/api/transaction.h index 4fa050f6..d9f1bed5 100644 --- a/modules/beast_sqdb/api/transaction.h +++ b/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/modules/beast_sqdb/api/type_conversion_traits.h b/modules/beast_sqdb/api/type_conversion_traits.h index 9625bd05..e49e9fab 100644 --- a/modules/beast_sqdb/api/type_conversion_traits.h +++ b/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/modules/beast_sqdb/beast_sqdb.h b/modules/beast_sqdb/beast_sqdb.h index 7e826fcb..2a547cf7 100644 --- a/modules/beast_sqdb/beast_sqdb.h +++ b/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/modules/beast_sqdb/beast_sqdb.unity.cpp b/modules/beast_sqdb/beast_sqdb.unity.cpp index fe27792c..fcb003b6 100644 --- a/modules/beast_sqdb/beast_sqdb.unity.cpp +++ b/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/modules/beast_sqlite/beast_sqlite.h b/modules/beast_sqlite/beast_sqlite.h index 0f4d678d..80491065 100644 --- a/modules/beast_sqlite/beast_sqlite.h +++ b/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/modules/beast_sqlite/beast_sqlite.unity.c b/modules/beast_sqlite/beast_sqlite.unity.c index 7e08b8f6..c5bf8b21 100644 --- a/modules/beast_sqlite/beast_sqlite.unity.c +++ b/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/modules/beast_sqlite/sqlite/sqlite3.c b/modules/beast_sqlite/sqlite/sqlite3.c index 7c6d3e28..850aba92 100644 --- a/modules/beast_sqlite/sqlite/sqlite3.c +++ b/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/site_scons/site_tools/VSProject.py b/site_scons/site_tools/VSProject.py index 5cff70f8..9e27ed6e 100644 --- a/site_scons/site_tools/VSProject.py +++ b/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