From 635b157b11be9531ea27e78d79e23ab5627acee6 Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Thu, 29 Jan 2015 12:48:39 -0500 Subject: [PATCH] Fix C++ guards in beast. --- src/beast/beast/chrono/chrono_util.h | 4 +- src/beast/beast/config/SelectCompilerConfig.h | 4 + src/beast/beast/config/SelectPlatformConfig.h | 4 + src/beast/beast/config/compiler/VisualC.h | 4 + src/beast/beast/config/platform/Android.h | 4 + src/beast/beast/container/buffer_view.h | 520 ++++++++++++++++++ src/beast/beast/container/cyclic_iterator.h | 4 +- .../detail/aged_associative_container.h | 4 +- .../detail/aged_container_iterator.h | 4 +- .../container/detail/aged_ordered_container.h | 4 +- .../detail/aged_unordered_container.h | 4 +- src/beast/beast/crypto/impl/sha2/sha2.h | 4 +- src/beast/beast/hash/impl/spookyv2.h | 4 +- src/beast/beast/hash/impl/xxhash.h | 4 +- src/beast/beast/hash/tests/hash_metrics.h | 4 +- src/beast/beast/http/detail/header_traits.h | 4 +- .../beast/http/impl/http-parser/http_parser.h | 7 +- src/beast/beast/module/asio/AsyncObject.h | 4 +- src/beast/beast/module/asio/BoostIncludes.h | 4 +- src/beast/beast/module/asio/HTTPField.h | 4 +- src/beast/beast/module/asio/HTTPHeaders.h | 4 +- src/beast/beast/module/asio/HTTPMessage.h | 4 +- src/beast/beast/module/asio/HTTPParser.h | 4 +- src/beast/beast/module/asio/HTTPParserImpl.h | 4 +- src/beast/beast/module/asio/HTTPRequest.h | 4 +- .../beast/module/asio/HTTPRequestParser.h | 4 +- src/beast/beast/module/asio/HTTPResponse.h | 4 +- .../beast/module/asio/HTTPResponseParser.h | 4 +- src/beast/beast/module/asio/HTTPVersion.h | 4 +- src/beast/beast/module/asio/OpenSSLIncludes.h | 4 +- .../beast/module/core/containers/Array.h | 4 +- .../core/containers/ArrayAllocationBase.h | 4 +- .../core/containers/ElementComparator.h | 4 +- src/beast/beast/module/core/core.h | 4 +- .../beast/module/core/diagnostic/FatalError.h | 4 +- .../core/diagnostic/MeasureFunctionCallTime.h | 4 +- .../module/core/diagnostic/SemanticVersion.h | 4 +- .../core/diagnostic/UnitTestUtilities.h | 4 +- .../module/core/files/DirectoryIterator.h | 4 +- src/beast/beast/module/core/files/File.h | 4 +- .../beast/module/core/files/FileInputStream.h | 4 +- .../module/core/files/FileOutputStream.h | 4 +- src/beast/beast/module/core/logging/Logger.h | 4 +- src/beast/beast/module/core/maths/Random.h | 4 +- .../beast/module/core/memory/MemoryBlock.h | 4 +- .../module/core/memory/SharedSingleton.h | 4 +- src/beast/beast/module/core/misc/Result.h | 4 +- .../module/core/native/BasicNativeHeaders.h | 4 +- .../module/core/native/osx_ObjCHelpers.h | 4 +- .../module/core/native/posix_SharedCode.h | 4 + .../module/core/streams/FileInputSource.h | 4 +- .../beast/module/core/streams/InputSource.h | 4 +- .../beast/module/core/streams/InputStream.h | 4 +- .../module/core/streams/MemoryOutputStream.h | 4 +- .../beast/module/core/streams/OutputStream.h | 4 +- .../module/core/system/StandardIncludes.h | 4 +- .../beast/module/core/system/SystemStats.h | 4 +- .../beast/module/core/text/LexicalCast.h | 4 +- .../beast/module/core/text/StringArray.h | 4 +- .../beast/module/core/text/StringPairArray.h | 4 +- .../beast/module/core/thread/DeadlineTimer.h | 4 +- .../beast/module/core/thread/MutexTraits.h | 4 +- src/beast/beast/module/core/thread/Workers.h | 4 +- .../module/core/thread/detail/ScopedLock.h | 4 +- .../module/core/threads/CriticalSection.h | 4 +- src/beast/beast/module/core/threads/Process.h | 4 +- .../beast/module/core/threads/ScopedLock.h | 4 +- src/beast/beast/module/core/time/AtExitHook.h | 4 +- src/beast/beast/module/core/time/Time.h | 4 +- src/beast/beast/module/sqdb/api/backend.h | 4 +- src/beast/beast/module/sqdb/api/blob.h | 4 +- src/beast/beast/module/sqdb/api/into.h | 4 +- src/beast/beast/module/sqdb/api/session.h | 4 +- src/beast/beast/module/sqdb/api/statement.h | 4 +- src/beast/beast/module/sqdb/api/transaction.h | 4 +- .../module/sqdb/api/type_conversion_traits.h | 4 +- src/beast/beast/module/sqdb/api/use.h | 4 +- .../beast/module/sqdb/detail/error_codes.h | 4 +- .../module/sqdb/detail/exchange_traits.h | 4 +- .../beast/module/sqdb/detail/into_type.h | 4 +- .../beast/module/sqdb/detail/once_temp_type.h | 4 +- .../module/sqdb/detail/prepare_temp_type.h | 4 +- .../sqdb/detail/ref_counted_prepare_info.h | 4 +- .../sqdb/detail/ref_counted_statement.h | 4 +- .../beast/module/sqdb/detail/statement_imp.h | 4 +- .../module/sqdb/detail/type_conversion.h | 4 +- src/beast/beast/module/sqdb/detail/type_ptr.h | 4 +- src/beast/beast/module/sqdb/detail/use_type.h | 4 +- src/beast/beast/module/sqdb/sqdb.h | 4 +- src/beast/beast/module/sqlite/sqlite.h | 4 +- .../beast/module/sqlite/sqlite/sqlite3.h | 5 +- .../beast/module/sqlite/sqlite/sqlite3ext.h | 5 +- src/beast/beast/nudb/detail/arena.h | 4 +- src/beast/beast/nudb/detail/bucket.h | 4 +- src/beast/beast/nudb/detail/buffers.h | 4 +- src/beast/beast/nudb/detail/bulkio.h | 4 +- src/beast/beast/nudb/detail/cache.h | 4 +- src/beast/beast/nudb/detail/config.h | 4 +- src/beast/beast/nudb/detail/field.h | 4 +- src/beast/beast/nudb/detail/format.h | 4 +- src/beast/beast/nudb/detail/gentex.h | 4 +- src/beast/beast/nudb/detail/pool.h | 4 +- src/beast/beast/nudb/detail/posix_file.h | 4 +- src/beast/beast/nudb/detail/stream.h | 4 +- src/beast/beast/nudb/detail/win32_file.h | 4 +- src/beast/beast/nudb/tests/common.h | 4 +- src/beast/beast/smart_ptr/SharedObject.h | 4 +- src/beast/beast/smart_ptr/SharedPtr.h | 4 +- src/beast/beast/streams/abstract_ostream.h | 4 +- src/beast/beast/streams/basic_std_ostream.h | 4 +- src/beast/beast/streams/debug_ostream.h | 4 +- src/beast/beast/strings/CharPointer_ASCII.h | 4 +- src/beast/beast/strings/CharPointer_UTF16.h | 4 +- src/beast/beast/strings/CharPointer_UTF32.h | 4 +- src/beast/beast/strings/CharPointer_UTF8.h | 4 +- .../beast/threads/ScopedWrapperContext.h | 4 +- src/beast/beast/threads/detail/BindHandler.h | 4 +- .../beast/threads/detail/DispatchedHandler.h | 4 +- src/beast/beast/unit_test/amount.h | 4 +- src/beast/beast/unit_test/match.h | 4 +- src/beast/beast/unit_test/print.h | 4 +- src/beast/beast/unit_test/recorder.h | 4 +- src/beast/beast/unit_test/reporter.h | 4 +- src/beast/beast/unit_test/results.h | 4 +- src/beast/beast/utility/WrappedSink.h | 4 +- src/beast/beast/utility/is_call_possible.h | 4 +- src/beast/beast/utility/maybe_const.h | 4 +- src/beast/beast/utility/noexcept.h | 4 +- 128 files changed, 788 insertions(+), 245 deletions(-) create mode 100644 src/beast/beast/container/buffer_view.h diff --git a/src/beast/beast/chrono/chrono_util.h b/src/beast/beast/chrono/chrono_util.h index 5d62be65a5..30d8411cfb 100644 --- a/src/beast/beast/chrono/chrono_util.h +++ b/src/beast/beast/chrono/chrono_util.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CHRONO_UTIL_H_INCLUDED -#define BEAST_CHRONO_UTIL_H_INCLUDED +#ifndef BEAST_CHRONO_CHRONO_UTIL_H_INCLUDED +#define BEAST_CHRONO_CHRONO_UTIL_H_INCLUDED // From Howard Hinnant // http://home.roadrunner.com/~hinnant/duration_io/chrono_util.html diff --git a/src/beast/beast/config/SelectCompilerConfig.h b/src/beast/beast/config/SelectCompilerConfig.h index addf083bbe..53d859a9c3 100644 --- a/src/beast/beast/config/SelectCompilerConfig.h +++ b/src/beast/beast/config/SelectCompilerConfig.h @@ -20,6 +20,9 @@ // Ideas from boost // Intel +#ifndef BEAST_CONFIG_SELECTCOMPILERCONFIG_H_INCLUDED +#define BEAST_CONFIG_SELECTCOMPILERCONFIG_H_INCLUDED + #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC) #define BEAST_COMPILER_CONFIG "config/compiler/Intel.h" @@ -42,3 +45,4 @@ #error "Unsupported compiler." #endif +#endif diff --git a/src/beast/beast/config/SelectPlatformConfig.h b/src/beast/beast/config/SelectPlatformConfig.h index eb00e630bc..3f35fd4e60 100644 --- a/src/beast/beast/config/SelectPlatformConfig.h +++ b/src/beast/beast/config/SelectPlatformConfig.h @@ -20,6 +20,9 @@ // Ideas from boost // Android, which must be manually set by defining BEAST_ANDROID +#ifndef BEAST_CONFIG_SELECTPLATFORMCONFIG_H_INCLUDED +#define BEAST_CONFIG_SELECTPLATFORMCONFIG_H_INCLUDED + #if defined(BEAST_ANDROID) #define BEAST_PLATFORM_CONFIG "config/platform/Android.h" @@ -42,3 +45,4 @@ #else #error "Unsupported platform." #endif +#endif diff --git a/src/beast/beast/config/compiler/VisualC.h b/src/beast/beast/config/compiler/VisualC.h index b4e1c05b7b..84b47018cc 100644 --- a/src/beast/beast/config/compiler/VisualC.h +++ b/src/beast/beast/config/compiler/VisualC.h @@ -19,4 +19,8 @@ // Microsoft Visual C++ compiler configuration +#ifndef BEAST_CONFIG_COMPILER_VISUALC_H_INCLUDED +#define BEAST_CONFIG_COMPILER_VISUALC_H_INCLUDED + #include +#endif diff --git a/src/beast/beast/config/platform/Android.h b/src/beast/beast/config/platform/Android.h index 9c61ebe105..5d80ca2316 100644 --- a/src/beast/beast/config/platform/Android.h +++ b/src/beast/beast/config/platform/Android.h @@ -19,8 +19,12 @@ // Android platform configuration +#ifndef BEAST_CONFIG_PLATFORM_ANDROID_H_INCLUDED +#define BEAST_CONFIG_PLATFORM_ANDROID_H_INCLUDED + #ifdef BEAST_ANDROID #undef BEAST_ANDROID #endif #define BEAST_ANDROID 1 +#endif diff --git a/src/beast/beast/container/buffer_view.h b/src/beast/beast/container/buffer_view.h new file mode 100644 index 0000000000..f6cc9f63bd --- /dev/null +++ b/src/beast/beast/container/buffer_view.h @@ -0,0 +1,520 @@ +//------------------------------------------------------------------------------ +/* + This file is part of Beast: https://github.com/vinniefalco/Beast + Copyright 2013, Vinnie Falco + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +#ifndef BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED +#define BEAST_CONTAINER_BUFFER_VIEW_H_INCLUDED + +#include + +#include +#include // +#include +#include +#include +#include +#include +#include // + +namespace beast { + +namespace detail { + +template >::value> +struct apply_const +{ + typedef U type; +}; + +template +struct apply_const +{ + typedef const U type; +}; + +// is_contiguous is true if C is a contiguous container +template +struct is_contiguous + : public std::false_type +{ +}; + +template +struct is_contiguous + : public is_contiguous +{ +}; + +template +struct is_contiguous > + : public std::true_type +{ +}; + +template +struct is_contiguous > + : public std::true_type +{ +}; + +template +struct is_contiguous > + : public std::true_type +{ +}; + +// True if T is const or U is not const +template +struct buffer_view_const_compatible : std::integral_constant ::value || ! std::is_const::value +> +{ +}; + +// True if T and U are the same or differ only in const, or +// if T and U are equally sized integral types. +template +struct buffer_view_ptr_compatible : std::integral_constant , std::remove_const >::value) || + (std::is_integral ::value && std::is_integral ::value && + sizeof (U) == sizeof (T)) +> +{ +}; + +// Determine if buffer_view is constructible from U* +template +struct buffer_view_convertible : std::integral_constant ::value && + buffer_view_ptr_compatible ::value +> +{ +}; + +// True if C is a container that can be used to construct a buffer_view +template +struct buffer_view_container_compatible : std::integral_constant ::value && buffer_view_convertible ::type>::value +> +{ +}; + +} // detail + +struct buffer_view_default_tag +{ +}; + +//------------------------------------------------------------------------------ + +/** A view into a range of contiguous container elements. + + The size of the view is determined at the time of construction. + This tries to emulate the interface of std::vector as closely as possible, + with the constraint that the size of the container cannot be changed. + + @tparam T The underlying element type. If T is const, member functions + which can modify elements are removed from the interface. + + @tparam Tag A type used to prevent two views with the same T from being + comparable or assignable. +*/ +template < + class T, + class Tag = buffer_view_default_tag +> +class buffer_view +{ +private: + T* m_base; + std::size_t m_size; + + static_assert (std::is_same >::value, + "T may not be a reference type"); + + static_assert (! std::is_same ::value, + "T may not be void"); + + static_assert (std::is_same , + std::remove_reference_t const>::value, + "Expected std::add_const to produce T const"); + + template + void + assign (Iter first, Iter last) noexcept + { + typedef typename std::iterator_traits ::value_type U; + + static_assert (detail::buffer_view_const_compatible ::value, + "Cannot convert from 'U const' to 'T', " + "conversion loses const qualifiers"); + + static_assert (detail::buffer_view_ptr_compatible ::value, + "Cannot convert from 'U*' to 'T*, " + "types are incompatible"); + + if (first == last) + { + m_base = nullptr; + m_size = 0; + } + else + { + #if 0 + // fails on gcc + m_base = reinterpret_cast ( + std::addressof (*first)); + #else + m_base = reinterpret_cast (&*first); + #endif + m_size = std::distance (first, last); + } + } + +public: + typedef T value_type; + typedef std::size_t size_type; + typedef std::ptrdiff_t difference_type; + typedef T& reference; + typedef T const& const_reference; + typedef T* pointer; + typedef T const* const_pointer; + typedef T* iterator; + typedef T const* const_iterator; + typedef std::reverse_iterator reverse_iterator; + typedef std::reverse_iterator const_reverse_iterator; + + // default construct + buffer_view () noexcept + : m_base (nullptr) + , m_size (0) + { + } + + // copy construct + template ::value> + > + buffer_view (buffer_view v) noexcept + { + assign (v.begin(), v.end()); + } + + // construct from container + template ::value + > + > + buffer_view (C& c) noexcept + { + assign (c.begin(), c.end()); + } + + // construct from pointer range + template ::value> + > + buffer_view (U* first, U* last) noexcept + { + assign (first, last); + } + + // construct from base and size + template ::value> + > + buffer_view (U* u, std::size_t n) noexcept + : m_base (u) + , m_size (n) + { + } + + // assign from container + template ::value + > + > + buffer_view& + operator= (C& c) noexcept + { + assign (c.begin(), c.end()); + return *this; + } + + // + // Element access + // + + reference + at (size_type pos) + { + if (! (pos < size())) + throw std::out_of_range ("bad array index"); + return m_base [pos]; + } + + const_reference + at (size_type pos) const + { + if (! (pos < size())) + throw std::out_of_range ("bad array index"); + return m_base [pos]; + } + + reference + operator[] (size_type pos) noexcept + { + return m_base [pos]; + } + + const_reference + operator[] (size_type pos) const noexcept + { + return m_base [pos]; + } + + reference + back() noexcept + { + return m_base [m_size - 1]; + } + + const_reference + back() const noexcept + { + return m_base [m_size - 1]; + } + + reference + front() noexcept + { + return *m_base; + } + + const_reference + front() const noexcept + { + return *m_base; + } + + pointer + data() noexcept + { + return m_base; + } + + const_pointer + data() const noexcept + { + return m_base; + } + + // + // Iterators + // + + iterator + begin() noexcept + { + return m_base; + } + + const_iterator + begin() const noexcept + { + return m_base; + } + + const_iterator + cbegin() const noexcept + { + return m_base; + } + + iterator + end() noexcept + { + return m_base + m_size; + } + + const_iterator + end() const noexcept + { + return m_base + m_size; + } + + const_iterator + cend() const noexcept + { + return m_base + m_size; + } + + reverse_iterator + rbegin() noexcept + { + return reverse_iterator (end()); + } + + const_reverse_iterator + rbegin() const noexcept + { + return const_reverse_iterator (cend()); + } + + const_reverse_iterator + crbegin() const noexcept + { + return const_reverse_iterator (cend()); + } + + reverse_iterator + rend() noexcept + { + return reverse_iterator (begin()); + } + + const_reverse_iterator + rend() const noexcept + { + return const_reverse_iterator (cbegin()); + } + + const_reverse_iterator + crend() const noexcept + { + return const_reverse_iterator (cbegin()); + } + + // + // Capacity + // + + bool + empty() const noexcept + { + return m_size == 0; + } + + size_type + size() const noexcept + { + return m_size; + } + + size_type + max_size() const noexcept + { + return size(); + } + + size_type + capacity() const noexcept + { + return size(); + } + + // + // Modifiers + // + + template + friend void swap (buffer_view & lhs, + buffer_view & rhs) noexcept; +}; + +//------------------------------------------------------------------------------ + +template +inline +bool +operator== (buffer_view lhs, buffer_view rhs) +{ + return std::equal ( + lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend()); +} + +template +inline +bool +operator!= (buffer_view lhs, buffer_view rhs) +{ + return ! (lhs == rhs); +} + +template +inline +bool +operator< (buffer_view lhs, buffer_view rhs) +{ + return std::lexicographical_compare ( + lhs.cbegin(), lhs.cend(), rhs.cbegin(), rhs.cend()); +} + +template +inline +bool +operator>= (buffer_view lhs, buffer_view rhs) +{ + return ! (lhs < rhs); +} + +template +inline +bool +operator> (buffer_view lhs, buffer_view rhs) +{ + return rhs < lhs; +} + +template +inline +bool +operator<= (buffer_view lhs, buffer_view rhs) +{ + return ! (rhs < lhs); +} + +template +inline +void +swap (buffer_view & lhs, buffer_view & rhs) noexcept +{ + std::swap (lhs.m_base, rhs.m_base); + std::swap (lhs.m_size, rhs.m_size); +} + +//------------------------------------------------------------------------------ + +template < + class T, + class Tag = buffer_view_default_tag +> +using const_buffer_view = buffer_view < + std::add_const_t , Tag>; + +} + +#endif diff --git a/src/beast/beast/container/cyclic_iterator.h b/src/beast/beast/container/cyclic_iterator.h index 2e5c63ca32..71c20ff956 100644 --- a/src/beast/beast/container/cyclic_iterator.h +++ b/src/beast/beast/container/cyclic_iterator.h @@ -27,8 +27,8 @@ */ //============================================================================== -#ifndef BEAST_CYCLIC_ITERATOR_H_INCLUDED -#define BEAST_CYCLIC_ITERATOR_H_INCLUDED +#ifndef BEAST_CONTAINER_CYCLIC_ITERATOR_H_INCLUDED +#define BEAST_CONTAINER_CYCLIC_ITERATOR_H_INCLUDED #include #include diff --git a/src/beast/beast/container/detail/aged_associative_container.h b/src/beast/beast/container/detail/aged_associative_container.h index df0bb1d7c8..752fc140ce 100644 --- a/src/beast/beast/container/detail/aged_associative_container.h +++ b/src/beast/beast/container/detail/aged_associative_container.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED -#define BEAST_CONTAINER_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED +#ifndef BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED +#define BEAST_CONTAINER_DETAIL_AGED_ASSOCIATIVE_CONTAINER_H_INCLUDED #include diff --git a/src/beast/beast/container/detail/aged_container_iterator.h b/src/beast/beast/container/detail/aged_container_iterator.h index 206b4a424f..f82cb401a1 100644 --- a/src/beast/beast/container/detail/aged_container_iterator.h +++ b/src/beast/beast/container/detail/aged_container_iterator.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED -#define BEAST_CONTAINER_AGED_CONTAINER_ITERATOR_H_INCLUDED +#ifndef BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED +#define BEAST_CONTAINER_DETAIL_AGED_CONTAINER_ITERATOR_H_INCLUDED #include #include diff --git a/src/beast/beast/container/detail/aged_ordered_container.h b/src/beast/beast/container/detail/aged_ordered_container.h index 4c8cc9f73d..ab8d7c4885 100644 --- a/src/beast/beast/container/detail/aged_ordered_container.h +++ b/src/beast/beast/container/detail/aged_ordered_container.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED -#define BEAST_CONTAINER_AGED_ORDERED_CONTAINER_H_INCLUDED +#ifndef BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED +#define BEAST_CONTAINER_DETAIL_AGED_ORDERED_CONTAINER_H_INCLUDED #include #include diff --git a/src/beast/beast/container/detail/aged_unordered_container.h b/src/beast/beast/container/detail/aged_unordered_container.h index 6ae3f4cfd6..bcfca25d30 100644 --- a/src/beast/beast/container/detail/aged_unordered_container.h +++ b/src/beast/beast/container/detail/aged_unordered_container.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED -#define BEAST_CONTAINER_AGED_UNORDERED_CONTAINER_H_INCLUDED +#ifndef BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED +#define BEAST_CONTAINER_DETAIL_AGED_UNORDERED_CONTAINER_H_INCLUDED #include #include diff --git a/src/beast/beast/crypto/impl/sha2/sha2.h b/src/beast/beast/crypto/impl/sha2/sha2.h index f1c4e7e9c5..81ca30587c 100644 --- a/src/beast/beast/crypto/impl/sha2/sha2.h +++ b/src/beast/beast/crypto/impl/sha2/sha2.h @@ -32,8 +32,8 @@ * $Id: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $ */ -#ifndef __SHA2_H__ -#define __SHA2_H__ +#ifndef BEAST_CRYPTO_SHA2_SHA2_H_INCLUDED +#define BEAST_CRYPTO_SHA2_SHA2_H_INCLUDED //#ifdef __cplusplus //extern "C" { diff --git a/src/beast/beast/hash/impl/spookyv2.h b/src/beast/beast/hash/impl/spookyv2.h index 15ae43a64c..fe3ab31bb3 100644 --- a/src/beast/beast/hash/impl/spookyv2.h +++ b/src/beast/beast/hash/impl/spookyv2.h @@ -26,8 +26,8 @@ // slower than MD5. // -#ifndef BEAST_SPOOKYV2_H_INCLUDED -#define BEAST_SPOOKYV2_H_INCLUDED +#ifndef BEAST_HASH_SPOOKYV2_H_INCLUDED +#define BEAST_HASH_SPOOKYV2_H_INCLUDED #include diff --git a/src/beast/beast/hash/impl/xxhash.h b/src/beast/beast/hash/impl/xxhash.h index f8a2fa5dba..4281f746a9 100644 --- a/src/beast/beast/hash/impl/xxhash.h +++ b/src/beast/beast/hash/impl/xxhash.h @@ -57,8 +57,8 @@ It depends on successfully passing SMHasher test set. 10 is a perfect score. */ -#ifndef BEAST_CONTAINER_XXHASH_H_INCLUDED -#define BEAST_CONTAINER_XXHASH_H_INCLUDED +#ifndef BEAST_HASH_XXHASH_H_INCLUDED +#define BEAST_HASH_XXHASH_H_INCLUDED /***************************** Includes diff --git a/src/beast/beast/hash/tests/hash_metrics.h b/src/beast/beast/hash/tests/hash_metrics.h index c5df4ef862..e0c5212186 100644 --- a/src/beast/beast/hash/tests/hash_metrics.h +++ b/src/beast/beast/hash/tests/hash_metrics.h @@ -18,8 +18,8 @@ */ //============================================================================== -#ifndef BEAST_CONTAINER_TESTS_HASH_METRICS_H_INCLUDED -#define BEAST_CONTAINER_TESTS_HASH_METRICS_H_INCLUDED +#ifndef BEAST_HASH_HASH_METRICS_H_INCLUDED +#define BEAST_HASH_HASH_METRICS_H_INCLUDED #include #include diff --git a/src/beast/beast/http/detail/header_traits.h b/src/beast/beast/http/detail/header_traits.h index c1f09f5d21..274ca2601a 100644 --- a/src/beast/beast/http/detail/header_traits.h +++ b/src/beast/beast/http/detail/header_traits.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HTTP_HEADER_TRAITS_H_INCLUDED -#define BEAST_HTTP_HEADER_TRAITS_H_INCLUDED +#ifndef BEAST_HTTP_DETAIL_HEADER_TRAITS_H_INCLUDED +#define BEAST_HTTP_DETAIL_HEADER_TRAITS_H_INCLUDED #include diff --git a/src/beast/beast/http/impl/http-parser/http_parser.h b/src/beast/beast/http/impl/http-parser/http_parser.h index 3e2881630d..dee9bb7d11 100644 --- a/src/beast/beast/http/impl/http-parser/http_parser.h +++ b/src/beast/beast/http/impl/http-parser/http_parser.h @@ -18,8 +18,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#ifndef http_parser_h -#define http_parser_h +#ifndef BEAST_HTTP_HTTP_PARSER_HTTP_PARSER_H_INCLUDED +#define BEAST_HTTP_HTTP_PARSER_HTTP_PARSER_H_INCLUDED + #ifdef __cplusplus extern "C" { #endif @@ -134,7 +135,7 @@ enum flags /* Map for errno-related constants - * + * * The provided argument should be a macro that takes 2 arguments. */ #define HTTP_ERRNO_MAP(XX) \ diff --git a/src/beast/beast/module/asio/AsyncObject.h b/src/beast/beast/module/asio/AsyncObject.h index 07c7fe4e44..38c6cc03f5 100644 --- a/src/beast/beast/module/asio/AsyncObject.h +++ b/src/beast/beast/module/asio/AsyncObject.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_ASYNCOBJECT_H_INCLUDED -#define BEAST_ASIO_ASYNCOBJECT_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_ASYNCOBJECT_H_INCLUDED +#define BEAST_MODULE_ASIO_ASYNCOBJECT_H_INCLUDED #include #include diff --git a/src/beast/beast/module/asio/BoostIncludes.h b/src/beast/beast/module/asio/BoostIncludes.h index 471a54a1f8..9f498eb927 100644 --- a/src/beast/beast/module/asio/BoostIncludes.h +++ b/src/beast/beast/module/asio/BoostIncludes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED -#define BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_BOOSTINCLUDES_H_INCLUDED +#define BEAST_MODULE_ASIO_BOOSTINCLUDES_H_INCLUDED // Make sure we take care of fixing boost::bind oddities first. #if !defined(BEAST_CORE_H_INCLUDED) diff --git a/src/beast/beast/module/asio/HTTPField.h b/src/beast/beast/module/asio/HTTPField.h index 257b65c7e3..8fbacc74e2 100644 --- a/src/beast/beast/module/asio/HTTPField.h +++ b/src/beast/beast/module/asio/HTTPField.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPFIELD_H_INCLUDED -#define BEAST_ASIO_HTTPFIELD_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPFIELD_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPFIELD_H_INCLUDED #include diff --git a/src/beast/beast/module/asio/HTTPHeaders.h b/src/beast/beast/module/asio/HTTPHeaders.h index f796dfd4d7..540ecfc95e 100644 --- a/src/beast/beast/module/asio/HTTPHeaders.h +++ b/src/beast/beast/module/asio/HTTPHeaders.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPHEADERS_H_INCLUDED -#define BEAST_ASIO_HTTPHEADERS_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPHEADERS_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPHEADERS_H_INCLUDED #include #include diff --git a/src/beast/beast/module/asio/HTTPMessage.h b/src/beast/beast/module/asio/HTTPMessage.h index 81e415d1a5..a3606309e9 100644 --- a/src/beast/beast/module/asio/HTTPMessage.h +++ b/src/beast/beast/module/asio/HTTPMessage.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPMESSAGE_H_INCLUDED -#define BEAST_ASIO_HTTPMESSAGE_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPMESSAGE_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPMESSAGE_H_INCLUDED #include #include diff --git a/src/beast/beast/module/asio/HTTPParser.h b/src/beast/beast/module/asio/HTTPParser.h index 1a77fed798..d882dce7a0 100644 --- a/src/beast/beast/module/asio/HTTPParser.h +++ b/src/beast/beast/module/asio/HTTPParser.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPPARSER_H_INCLUDED -#define BEAST_ASIO_HTTPPARSER_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPPARSER_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPPARSER_H_INCLUDED #include #include diff --git a/src/beast/beast/module/asio/HTTPParserImpl.h b/src/beast/beast/module/asio/HTTPParserImpl.h index 6d9cd6d9ca..a62b4a3333 100644 --- a/src/beast/beast/module/asio/HTTPParserImpl.h +++ b/src/beast/beast/module/asio/HTTPParserImpl.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HTTPPARSERIMPL_H_INCLUDED -#define BEAST_HTTPPARSERIMPL_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPPARSERIMPL_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPPARSERIMPL_H_INCLUDED #include #include diff --git a/src/beast/beast/module/asio/HTTPRequest.h b/src/beast/beast/module/asio/HTTPRequest.h index afffec5afc..4c1fee958d 100644 --- a/src/beast/beast/module/asio/HTTPRequest.h +++ b/src/beast/beast/module/asio/HTTPRequest.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPREQUEST_H_INCLUDED -#define BEAST_ASIO_HTTPREQUEST_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPREQUEST_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPREQUEST_H_INCLUDED #include diff --git a/src/beast/beast/module/asio/HTTPRequestParser.h b/src/beast/beast/module/asio/HTTPRequestParser.h index 2c5cb6ff89..4736581a6c 100644 --- a/src/beast/beast/module/asio/HTTPRequestParser.h +++ b/src/beast/beast/module/asio/HTTPRequestParser.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HTTP_REQUESTPARSER_H_INCLUDED -#define BEAST_HTTP_REQUESTPARSER_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPREQUESTPARSER_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPREQUESTPARSER_H_INCLUDED #include diff --git a/src/beast/beast/module/asio/HTTPResponse.h b/src/beast/beast/module/asio/HTTPResponse.h index a0a22a012b..94a5f18ad1 100644 --- a/src/beast/beast/module/asio/HTTPResponse.h +++ b/src/beast/beast/module/asio/HTTPResponse.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPRESPONSE_H_INCLUDED -#define BEAST_ASIO_HTTPRESPONSE_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPRESPONSE_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPRESPONSE_H_INCLUDED #include diff --git a/src/beast/beast/module/asio/HTTPResponseParser.h b/src/beast/beast/module/asio/HTTPResponseParser.h index 12ce69a7b9..d7305aebbb 100644 --- a/src/beast/beast/module/asio/HTTPResponseParser.h +++ b/src/beast/beast/module/asio/HTTPResponseParser.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HTTP_RESPONSEPARSER_H_INCLUDED -#define BEAST_HTTP_RESPONSEPARSER_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPRESPONSEPARSER_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPRESPONSEPARSER_H_INCLUDED #include diff --git a/src/beast/beast/module/asio/HTTPVersion.h b/src/beast/beast/module/asio/HTTPVersion.h index 8f12f87ef5..eadf890b18 100644 --- a/src/beast/beast/module/asio/HTTPVersion.h +++ b/src/beast/beast/module/asio/HTTPVersion.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_HTTPVERSION_H_INCLUDED -#define BEAST_ASIO_HTTPVERSION_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_HTTPVERSION_H_INCLUDED +#define BEAST_MODULE_ASIO_HTTPVERSION_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/asio/OpenSSLIncludes.h b/src/beast/beast/module/asio/OpenSSLIncludes.h index 20aebf1e50..91c14f6be7 100644 --- a/src/beast/beast/module/asio/OpenSSLIncludes.h +++ b/src/beast/beast/module/asio/OpenSSLIncludes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED -#define BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED +#ifndef BEAST_MODULE_ASIO_OPENSSLINCLUDES_H_INCLUDED +#define BEAST_MODULE_ASIO_OPENSSLINCLUDES_H_INCLUDED #define OPENSSL_THREAD_DEFINES #include diff --git a/src/beast/beast/module/core/containers/Array.h b/src/beast/beast/module/core/containers/Array.h index 6391e3821c..6ef234a7e8 100644 --- a/src/beast/beast/module/core/containers/Array.h +++ b/src/beast/beast/module/core/containers/Array.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ARRAY_H_INCLUDED -#define BEAST_ARRAY_H_INCLUDED +#ifndef BEAST_MODULE_CORE_CONTAINERS_ARRAY_H_INCLUDED +#define BEAST_MODULE_CORE_CONTAINERS_ARRAY_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/containers/ArrayAllocationBase.h b/src/beast/beast/module/core/containers/ArrayAllocationBase.h index 874d40402d..6b2e08e384 100644 --- a/src/beast/beast/module/core/containers/ArrayAllocationBase.h +++ b/src/beast/beast/module/core/containers/ArrayAllocationBase.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ARRAYALLOCATIONBASE_H_INCLUDED -#define BEAST_ARRAYALLOCATIONBASE_H_INCLUDED +#ifndef BEAST_MODULE_CORE_CONTAINERS_ARRAYALLOCATIONBASE_H_INCLUDED +#define BEAST_MODULE_CORE_CONTAINERS_ARRAYALLOCATIONBASE_H_INCLUDED #include diff --git a/src/beast/beast/module/core/containers/ElementComparator.h b/src/beast/beast/module/core/containers/ElementComparator.h index d856ab879c..c683f2db4e 100644 --- a/src/beast/beast/module/core/containers/ElementComparator.h +++ b/src/beast/beast/module/core/containers/ElementComparator.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ELEMENTCOMPARATOR_H_INCLUDED -#define BEAST_ELEMENTCOMPARATOR_H_INCLUDED +#ifndef BEAST_MODULE_CORE_CONTAINERS_ELEMENTCOMPARATOR_H_INCLUDED +#define BEAST_MODULE_CORE_CONTAINERS_ELEMENTCOMPARATOR_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/core.h b/src/beast/beast/module/core/core.h index 01fd5fa1ba..0484e109b3 100644 --- a/src/beast/beast/module/core/core.h +++ b/src/beast/beast/module/core/core.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_H_INCLUDED -#define BEAST_CORE_H_INCLUDED +#ifndef BEAST_MODULE_CORE_CORE_H_INCLUDED +#define BEAST_MODULE_CORE_CORE_H_INCLUDED // TargetPlatform.h should not use anything from BeastConfig.h #include diff --git a/src/beast/beast/module/core/diagnostic/FatalError.h b/src/beast/beast/module/core/diagnostic/FatalError.h index 9b11b27423..cd6250fd4a 100644 --- a/src/beast/beast/module/core/diagnostic/FatalError.h +++ b/src/beast/beast/module/core/diagnostic/FatalError.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_FATALERROR_H_INCLUDED -#define BEAST_CORE_FATALERROR_H_INCLUDED +#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_FATALERROR_H_INCLUDED +#define BEAST_MODULE_CORE_DIAGNOSTIC_FATALERROR_H_INCLUDED #include diff --git a/src/beast/beast/module/core/diagnostic/MeasureFunctionCallTime.h b/src/beast/beast/module/core/diagnostic/MeasureFunctionCallTime.h index c04b32d070..413b741bf3 100644 --- a/src/beast/beast/module/core/diagnostic/MeasureFunctionCallTime.h +++ b/src/beast/beast/module/core/diagnostic/MeasureFunctionCallTime.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED -#define BEAST_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED +#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED +#define BEAST_MODULE_CORE_DIAGNOSTIC_MEASUREFUNCTIONCALLTIME_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/diagnostic/SemanticVersion.h b/src/beast/beast/module/core/diagnostic/SemanticVersion.h index c3e0cfce5c..0b7ef0862a 100644 --- a/src/beast/beast/module/core/diagnostic/SemanticVersion.h +++ b/src/beast/beast/module/core/diagnostic/SemanticVersion.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SEMANTICVERSION_H_INCLUDED -#define BEAST_SEMANTICVERSION_H_INCLUDED +#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED +#define BEAST_MODULE_CORE_DIAGNOSTIC_SEMANTICVERSION_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/diagnostic/UnitTestUtilities.h b/src/beast/beast/module/core/diagnostic/UnitTestUtilities.h index b424282a85..cb6df79d26 100644 --- a/src/beast/beast/module/core/diagnostic/UnitTestUtilities.h +++ b/src/beast/beast/module/core/diagnostic/UnitTestUtilities.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNITTESTUTILITIES_H_INCLUDED -#define BEAST_UNITTESTUTILITIES_H_INCLUDED +#ifndef BEAST_MODULE_CORE_DIAGNOSTIC_UNITTESTUTILITIES_H_INCLUDED +#define BEAST_MODULE_CORE_DIAGNOSTIC_UNITTESTUTILITIES_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/files/DirectoryIterator.h b/src/beast/beast/module/core/files/DirectoryIterator.h index a002368286..ec107bba43 100644 --- a/src/beast/beast/module/core/files/DirectoryIterator.h +++ b/src/beast/beast/module/core/files/DirectoryIterator.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_DIRECTORYITERATOR_H_INCLUDED -#define BEAST_DIRECTORYITERATOR_H_INCLUDED +#ifndef BEAST_MODULE_CORE_FILES_DIRECTORYITERATOR_H_INCLUDED +#define BEAST_MODULE_CORE_FILES_DIRECTORYITERATOR_H_INCLUDED #include diff --git a/src/beast/beast/module/core/files/File.h b/src/beast/beast/module/core/files/File.h index 32c65d4b79..428a45af13 100644 --- a/src/beast/beast/module/core/files/File.h +++ b/src/beast/beast/module/core/files/File.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILE_H_INCLUDED -#define BEAST_FILE_H_INCLUDED +#ifndef BEAST_MODULE_CORE_FILES_FILE_H_INCLUDED +#define BEAST_MODULE_CORE_FILES_FILE_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/files/FileInputStream.h b/src/beast/beast/module/core/files/FileInputStream.h index c946a74026..f145516232 100644 --- a/src/beast/beast/module/core/files/FileInputStream.h +++ b/src/beast/beast/module/core/files/FileInputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILEINPUTSTREAM_H_INCLUDED -#define BEAST_FILEINPUTSTREAM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_FILES_FILEINPUTSTREAM_H_INCLUDED +#define BEAST_MODULE_CORE_FILES_FILEINPUTSTREAM_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/files/FileOutputStream.h b/src/beast/beast/module/core/files/FileOutputStream.h index 53f1dad8ce..650513e7f1 100644 --- a/src/beast/beast/module/core/files/FileOutputStream.h +++ b/src/beast/beast/module/core/files/FileOutputStream.h @@ -24,8 +24,8 @@ namespace beast { -#ifndef BEAST_FILEOUTPUTSTREAM_H_INCLUDED -#define BEAST_FILEOUTPUTSTREAM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_FILES_FILEOUTPUTSTREAM_H_INCLUDED +#define BEAST_MODULE_CORE_FILES_FILEOUTPUTSTREAM_H_INCLUDED //============================================================================== /** diff --git a/src/beast/beast/module/core/logging/Logger.h b/src/beast/beast/module/core/logging/Logger.h index cff7b91ae3..928145d425 100644 --- a/src/beast/beast/module/core/logging/Logger.h +++ b/src/beast/beast/module/core/logging/Logger.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_LOGGER_H_INCLUDED -#define BEAST_LOGGER_H_INCLUDED +#ifndef BEAST_MODULE_CORE_LOGGING_LOGGER_H_INCLUDED +#define BEAST_MODULE_CORE_LOGGING_LOGGER_H_INCLUDED #include diff --git a/src/beast/beast/module/core/maths/Random.h b/src/beast/beast/module/core/maths/Random.h index b094359dad..631c164ab2 100644 --- a/src/beast/beast/module/core/maths/Random.h +++ b/src/beast/beast/module/core/maths/Random.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RANDOM_H_INCLUDED -#define BEAST_RANDOM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_MATHS_RANDOM_H_INCLUDED +#define BEAST_MODULE_CORE_MATHS_RANDOM_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/memory/MemoryBlock.h b/src/beast/beast/module/core/memory/MemoryBlock.h index fe002e9105..2272848bed 100644 --- a/src/beast/beast/module/core/memory/MemoryBlock.h +++ b/src/beast/beast/module/core/memory/MemoryBlock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYBLOCK_H_INCLUDED -#define BEAST_MEMORYBLOCK_H_INCLUDED +#ifndef BEAST_MODULE_CORE_MEMORY_MEMORYBLOCK_H_INCLUDED +#define BEAST_MODULE_CORE_MEMORY_MEMORYBLOCK_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/memory/SharedSingleton.h b/src/beast/beast/module/core/memory/SharedSingleton.h index ff1b5a2500..84a2e9c1e4 100644 --- a/src/beast/beast/module/core/memory/SharedSingleton.h +++ b/src/beast/beast/module/core/memory/SharedSingleton.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDSINGLETON_H_INCLUDED -#define BEAST_SHAREDSINGLETON_H_INCLUDED +#ifndef BEAST_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED +#define BEAST_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/misc/Result.h b/src/beast/beast/module/core/misc/Result.h index c503bb0408..baba95989c 100644 --- a/src/beast/beast/module/core/misc/Result.h +++ b/src/beast/beast/module/core/misc/Result.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RESULT_H_INCLUDED -#define BEAST_RESULT_H_INCLUDED +#ifndef BEAST_MODULE_CORE_MISC_RESULT_H_INCLUDED +#define BEAST_MODULE_CORE_MISC_RESULT_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/native/BasicNativeHeaders.h b/src/beast/beast/module/core/native/BasicNativeHeaders.h index 1a727a4105..5dc0a9dbbd 100644 --- a/src/beast/beast/module/core/native/BasicNativeHeaders.h +++ b/src/beast/beast/module/core/native/BasicNativeHeaders.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED -#define BEAST_BASICNATIVEHEADERS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_NATIVE_BASICNATIVEHEADERS_H_INCLUDED +#define BEAST_MODULE_CORE_NATIVE_BASICNATIVEHEADERS_H_INCLUDED #include diff --git a/src/beast/beast/module/core/native/osx_ObjCHelpers.h b/src/beast/beast/module/core/native/osx_ObjCHelpers.h index 94d972b4ed..8503932bdc 100644 --- a/src/beast/beast/module/core/native/osx_ObjCHelpers.h +++ b/src/beast/beast/module/core/native/osx_ObjCHelpers.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OSX_OBJCHELPERS_H_INCLUDED -#define BEAST_OSX_OBJCHELPERS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_NATIVE_OSX_OBJCHELPERS_H_INCLUDED +#define BEAST_MODULE_CORE_NATIVE_OSX_OBJCHELPERS_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/native/posix_SharedCode.h b/src/beast/beast/module/core/native/posix_SharedCode.h index b75eb8a3a4..e4036ae4f3 100644 --- a/src/beast/beast/module/core/native/posix_SharedCode.h +++ b/src/beast/beast/module/core/native/posix_SharedCode.h @@ -45,6 +45,9 @@ void CriticalSection::exit() const noexcept { pthread_mutex_unlock (&mutex); void Process::terminate() { +#ifndef BEAST_MODULE_CORE_NATIVE_POSIX_SHAREDCODE_H_INCLUDED +#define BEAST_MODULE_CORE_NATIVE_POSIX_SHAREDCODE_H_INCLUDED + #if BEAST_ANDROID || BEAST_BSD // http://www.unix.com/man-page/FreeBSD/2/_exit/ ::_exit (EXIT_FAILURE); @@ -459,3 +462,4 @@ std::int64_t File::getVolumeTotalSize() const } } // beast +#endif diff --git a/src/beast/beast/module/core/streams/FileInputSource.h b/src/beast/beast/module/core/streams/FileInputSource.h index 21812c5ae3..ac335e728b 100644 --- a/src/beast/beast/module/core/streams/FileInputSource.h +++ b/src/beast/beast/module/core/streams/FileInputSource.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILEINPUTSOURCE_H_INCLUDED -#define BEAST_FILEINPUTSOURCE_H_INCLUDED +#ifndef BEAST_MODULE_CORE_STREAMS_FILEINPUTSOURCE_H_INCLUDED +#define BEAST_MODULE_CORE_STREAMS_FILEINPUTSOURCE_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/streams/InputSource.h b/src/beast/beast/module/core/streams/InputSource.h index 6b98f15248..6a0c1f64d1 100644 --- a/src/beast/beast/module/core/streams/InputSource.h +++ b/src/beast/beast/module/core/streams/InputSource.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_INPUTSOURCE_H_INCLUDED -#define BEAST_INPUTSOURCE_H_INCLUDED +#ifndef BEAST_MODULE_CORE_STREAMS_INPUTSOURCE_H_INCLUDED +#define BEAST_MODULE_CORE_STREAMS_INPUTSOURCE_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/streams/InputStream.h b/src/beast/beast/module/core/streams/InputStream.h index e7b23770c7..afe92919c0 100644 --- a/src/beast/beast/module/core/streams/InputStream.h +++ b/src/beast/beast/module/core/streams/InputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_INPUTSTREAM_H_INCLUDED -#define BEAST_INPUTSTREAM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_STREAMS_INPUTSTREAM_H_INCLUDED +#define BEAST_MODULE_CORE_STREAMS_INPUTSTREAM_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/streams/MemoryOutputStream.h b/src/beast/beast/module/core/streams/MemoryOutputStream.h index f4c7356b6b..c705b97f01 100644 --- a/src/beast/beast/module/core/streams/MemoryOutputStream.h +++ b/src/beast/beast/module/core/streams/MemoryOutputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED -#define BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_STREAMS_MEMORYOUTPUTSTREAM_H_INCLUDED +#define BEAST_MODULE_CORE_STREAMS_MEMORYOUTPUTSTREAM_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/streams/OutputStream.h b/src/beast/beast/module/core/streams/OutputStream.h index a3feb87c17..d1412b8eab 100644 --- a/src/beast/beast/module/core/streams/OutputStream.h +++ b/src/beast/beast/module/core/streams/OutputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OUTPUTSTREAM_H_INCLUDED -#define BEAST_OUTPUTSTREAM_H_INCLUDED +#ifndef BEAST_MODULE_CORE_STREAMS_OUTPUTSTREAM_H_INCLUDED +#define BEAST_MODULE_CORE_STREAMS_OUTPUTSTREAM_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/system/StandardIncludes.h b/src/beast/beast/module/core/system/StandardIncludes.h index 39994fa1a7..a714de1c09 100644 --- a/src/beast/beast/module/core/system/StandardIncludes.h +++ b/src/beast/beast/module/core/system/StandardIncludes.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STANDARDINCLUDES_H_INCLUDED -#define BEAST_STANDARDINCLUDES_H_INCLUDED +#ifndef BEAST_MODULE_CORE_SYSTEM_STANDARDINCLUDES_H_INCLUDED +#define BEAST_MODULE_CORE_SYSTEM_STANDARDINCLUDES_H_INCLUDED // Include some common OS headers.. #if BEAST_MSVC diff --git a/src/beast/beast/module/core/system/SystemStats.h b/src/beast/beast/module/core/system/SystemStats.h index 30806942e3..b325abefdf 100644 --- a/src/beast/beast/module/core/system/SystemStats.h +++ b/src/beast/beast/module/core/system/SystemStats.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SYSTEMSTATS_H_INCLUDED -#define BEAST_SYSTEMSTATS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_SYSTEM_SYSTEMSTATS_H_INCLUDED +#define BEAST_MODULE_CORE_SYSTEM_SYSTEMSTATS_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/text/LexicalCast.h b/src/beast/beast/module/core/text/LexicalCast.h index f0d55ec89b..353c133738 100644 --- a/src/beast/beast/module/core/text/LexicalCast.h +++ b/src/beast/beast/module/core/text/LexicalCast.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_LEXICALCAST_H_INCLUDED -#define BEAST_LEXICALCAST_H_INCLUDED +#ifndef BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED +#define BEAST_MODULE_CORE_TEXT_LEXICALCAST_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/text/StringArray.h b/src/beast/beast/module/core/text/StringArray.h index aa61c60cb1..8bd618eb7b 100644 --- a/src/beast/beast/module/core/text/StringArray.h +++ b/src/beast/beast/module/core/text/StringArray.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRINGARRAY_H_INCLUDED -#define BEAST_STRINGARRAY_H_INCLUDED +#ifndef BEAST_MODULE_CORE_TEXT_STRINGARRAY_H_INCLUDED +#define BEAST_MODULE_CORE_TEXT_STRINGARRAY_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/text/StringPairArray.h b/src/beast/beast/module/core/text/StringPairArray.h index 40e850a6f0..b4f856e947 100644 --- a/src/beast/beast/module/core/text/StringPairArray.h +++ b/src/beast/beast/module/core/text/StringPairArray.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRINGPAIRARRAY_H_INCLUDED -#define BEAST_STRINGPAIRARRAY_H_INCLUDED +#ifndef BEAST_MODULE_CORE_TEXT_STRINGPAIRARRAY_H_INCLUDED +#define BEAST_MODULE_CORE_TEXT_STRINGPAIRARRAY_H_INCLUDED #include diff --git a/src/beast/beast/module/core/thread/DeadlineTimer.h b/src/beast/beast/module/core/thread/DeadlineTimer.h index bdefef54cd..348ab5f7f8 100644 --- a/src/beast/beast/module/core/thread/DeadlineTimer.h +++ b/src/beast/beast/module/core/thread/DeadlineTimer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_DEADLINETIMER_H_INCLUDED -#define BEAST_DEADLINETIMER_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED +#define BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED #include diff --git a/src/beast/beast/module/core/thread/MutexTraits.h b/src/beast/beast/module/core/thread/MutexTraits.h index f8da2cecba..0f6b2b09bd 100644 --- a/src/beast/beast/module/core/thread/MutexTraits.h +++ b/src/beast/beast/module/core/thread/MutexTraits.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_THREAD_MUTEXTRAITS_H_INCLUDED -#define BEAST_CORE_THREAD_MUTEXTRAITS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREAD_MUTEXTRAITS_H_INCLUDED +#define BEAST_MODULE_CORE_THREAD_MUTEXTRAITS_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/thread/Workers.h b/src/beast/beast/module/core/thread/Workers.h index 07665f2393..c4901ec308 100644 --- a/src/beast/beast/module/core/thread/Workers.h +++ b/src/beast/beast/module/core/thread/Workers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_WORKERS_H_INCLUDED -#define BEAST_WORKERS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREAD_WORKERS_H_INCLUDED +#define BEAST_MODULE_CORE_THREAD_WORKERS_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/thread/detail/ScopedLock.h b/src/beast/beast/module/core/thread/detail/ScopedLock.h index a55d897730..ad690e8d1f 100644 --- a/src/beast/beast/module/core/thread/detail/ScopedLock.h +++ b/src/beast/beast/module/core/thread/detail/ScopedLock.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED -#define BEAST_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED +#define BEAST_MODULE_CORE_THREAD_DETAIL_SCOPEDLOCK_H_INCLUDED #include diff --git a/src/beast/beast/module/core/threads/CriticalSection.h b/src/beast/beast/module/core/threads/CriticalSection.h index 48f1c8c24d..9120b0ee72 100644 --- a/src/beast/beast/module/core/threads/CriticalSection.h +++ b/src/beast/beast/module/core/threads/CriticalSection.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CRITICALSECTION_H_INCLUDED -#define BEAST_CRITICALSECTION_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREADS_CRITICALSECTION_H_INCLUDED +#define BEAST_MODULE_CORE_THREADS_CRITICALSECTION_H_INCLUDED #include #include diff --git a/src/beast/beast/module/core/threads/Process.h b/src/beast/beast/module/core/threads/Process.h index 97e8309b23..54a964af9d 100644 --- a/src/beast/beast/module/core/threads/Process.h +++ b/src/beast/beast/module/core/threads/Process.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_PROCESS_H_INCLUDED -#define BEAST_PROCESS_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREADS_PROCESS_H_INCLUDED +#define BEAST_MODULE_CORE_THREADS_PROCESS_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/threads/ScopedLock.h b/src/beast/beast/module/core/threads/ScopedLock.h index 16f37ac0cb..a481a4b83c 100644 --- a/src/beast/beast/module/core/threads/ScopedLock.h +++ b/src/beast/beast/module/core/threads/ScopedLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDLOCK_H_INCLUDED -#define BEAST_SCOPEDLOCK_H_INCLUDED +#ifndef BEAST_MODULE_CORE_THREADS_SCOPEDLOCK_H_INCLUDED +#define BEAST_MODULE_CORE_THREADS_SCOPEDLOCK_H_INCLUDED namespace beast { diff --git a/src/beast/beast/module/core/time/AtExitHook.h b/src/beast/beast/module/core/time/AtExitHook.h index 91fdf85e89..3d035df620 100644 --- a/src/beast/beast/module/core/time/AtExitHook.h +++ b/src/beast/beast/module/core/time/AtExitHook.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CORE_ATEXITHOOK_H_INCLUDED -#define BEAST_CORE_ATEXITHOOK_H_INCLUDED +#ifndef BEAST_MODULE_CORE_TIME_ATEXITHOOK_H_INCLUDED +#define BEAST_MODULE_CORE_TIME_ATEXITHOOK_H_INCLUDED #include diff --git a/src/beast/beast/module/core/time/Time.h b/src/beast/beast/module/core/time/Time.h index ba367ad769..0f779f440a 100644 --- a/src/beast/beast/module/core/time/Time.h +++ b/src/beast/beast/module/core/time/Time.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TIME_H_INCLUDED -#define BEAST_TIME_H_INCLUDED +#ifndef BEAST_MODULE_CORE_TIME_TIME_H_INCLUDED +#define BEAST_MODULE_CORE_TIME_TIME_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/api/backend.h b/src/beast/beast/module/sqdb/api/backend.h index 09911ba8c7..2bc7d33c8a 100644 --- a/src/beast/beast/module/sqdb/api/backend.h +++ b/src/beast/beast/module/sqdb/api/backend.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_BACKEND_H_INCLUDED -#define BEAST_SQDB_BACKEND_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_BACKEND_H_INCLUDED +#define BEAST_MODULE_SQDB_API_BACKEND_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/api/blob.h b/src/beast/beast/module/sqdb/api/blob.h index 16bf28f5f5..9627f14553 100644 --- a/src/beast/beast/module/sqdb/api/blob.h +++ b/src/beast/beast/module/sqdb/api/blob.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_BLOB_H_INCLUDED -#define BEAST_SQDB_BLOB_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_BLOB_H_INCLUDED +#define BEAST_MODULE_SQDB_API_BLOB_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/api/into.h b/src/beast/beast/module/sqdb/api/into.h index 4c793dd178..72a41e1b65 100644 --- a/src/beast/beast/module/sqdb/api/into.h +++ b/src/beast/beast/module/sqdb/api/into.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_INTO_H_INCLUDED -#define BEAST_SQDB_INTO_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_INTO_H_INCLUDED +#define BEAST_MODULE_SQDB_API_INTO_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/api/session.h b/src/beast/beast/module/sqdb/api/session.h index 3e271fece6..93965edabb 100644 --- a/src/beast/beast/module/sqdb/api/session.h +++ b/src/beast/beast/module/sqdb/api/session.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_SESSION_H_INCLUDED -#define BEAST_SQDB_SESSION_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_SESSION_H_INCLUDED +#define BEAST_MODULE_SQDB_API_SESSION_H_INCLUDED #include #include diff --git a/src/beast/beast/module/sqdb/api/statement.h b/src/beast/beast/module/sqdb/api/statement.h index 99632b4ecf..147cf4e1a4 100644 --- a/src/beast/beast/module/sqdb/api/statement.h +++ b/src/beast/beast/module/sqdb/api/statement.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_STATEMENT_H_INCLUDED -#define BEAST_SQDB_STATEMENT_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_STATEMENT_H_INCLUDED +#define BEAST_MODULE_SQDB_API_STATEMENT_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/api/transaction.h b/src/beast/beast/module/sqdb/api/transaction.h index d9f1bed508..e9d538c22a 100644 --- a/src/beast/beast/module/sqdb/api/transaction.h +++ b/src/beast/beast/module/sqdb/api/transaction.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_TRANSACTION_H_INCLUDED -#define BEAST_SQDB_TRANSACTION_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_TRANSACTION_H_INCLUDED +#define BEAST_MODULE_SQDB_API_TRANSACTION_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/api/type_conversion_traits.h b/src/beast/beast/module/sqdb/api/type_conversion_traits.h index 58c99475ff..9426d3d72b 100644 --- a/src/beast/beast/module/sqdb/api/type_conversion_traits.h +++ b/src/beast/beast/module/sqdb/api/type_conversion_traits.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED -#define BEAST_SQDB_TYPE_CONVERSION_TRAITS_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_TYPE_CONVERSION_TRAITS_H_INCLUDED +#define BEAST_MODULE_SQDB_API_TYPE_CONVERSION_TRAITS_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/api/use.h b/src/beast/beast/module/sqdb/api/use.h index e5f224b1ab..ddf70efd3d 100644 --- a/src/beast/beast/module/sqdb/api/use.h +++ b/src/beast/beast/module/sqdb/api/use.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_USE_H_INCLUDED -#define BEAST_SQDB_USE_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_API_USE_H_INCLUDED +#define BEAST_MODULE_SQDB_API_USE_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/error_codes.h b/src/beast/beast/module/sqdb/detail/error_codes.h index f3c8cd3b7d..001fcba3f9 100644 --- a/src/beast/beast/module/sqdb/detail/error_codes.h +++ b/src/beast/beast/module/sqdb/detail/error_codes.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_ERROR_CODES_H_INCLUDED -#define BEAST_SQDB_DETAIL_ERROR_CODES_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_ERROR_CODES_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_ERROR_CODES_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/exchange_traits.h b/src/beast/beast/module/sqdb/detail/exchange_traits.h index b5021d883c..8626e4791e 100644 --- a/src/beast/beast/module/sqdb/detail/exchange_traits.h +++ b/src/beast/beast/module/sqdb/detail/exchange_traits.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED -#define BEAST_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_EXCHANGE_TRAITS_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/into_type.h b/src/beast/beast/module/sqdb/detail/into_type.h index 56370752c8..2387aea682 100644 --- a/src/beast/beast/module/sqdb/detail/into_type.h +++ b/src/beast/beast/module/sqdb/detail/into_type.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_INTO_TYPE_H_INCLUDED -#define BEAST_SQDB_DETAIL_INTO_TYPE_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_INTO_TYPE_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_INTO_TYPE_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/once_temp_type.h b/src/beast/beast/module/sqdb/detail/once_temp_type.h index dad9aca2ef..a5c336e9c4 100644 --- a/src/beast/beast/module/sqdb/detail/once_temp_type.h +++ b/src/beast/beast/module/sqdb/detail/once_temp_type.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED -#define BEAST_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_ONCE_TEMP_TYPE_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/prepare_temp_type.h b/src/beast/beast/module/sqdb/detail/prepare_temp_type.h index f7fb207736..723b0f9941 100644 --- a/src/beast/beast/module/sqdb/detail/prepare_temp_type.h +++ b/src/beast/beast/module/sqdb/detail/prepare_temp_type.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED -#define BEAST_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_PREPARE_TEMP_TYPE_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/ref_counted_prepare_info.h b/src/beast/beast/module/sqdb/detail/ref_counted_prepare_info.h index 0055c081a2..f80a1610cc 100644 --- a/src/beast/beast/module/sqdb/detail/ref_counted_prepare_info.h +++ b/src/beast/beast/module/sqdb/detail/ref_counted_prepare_info.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED -#define BEAST_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_PREPARE_INFO_H_INCLUDED #include diff --git a/src/beast/beast/module/sqdb/detail/ref_counted_statement.h b/src/beast/beast/module/sqdb/detail/ref_counted_statement.h index df3679b0f2..0a1307e224 100644 --- a/src/beast/beast/module/sqdb/detail/ref_counted_statement.h +++ b/src/beast/beast/module/sqdb/detail/ref_counted_statement.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED -#define BEAST_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_REF_COUNTED_STATEMENT_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/statement_imp.h b/src/beast/beast/module/sqdb/detail/statement_imp.h index 9c6278e0fc..9e229ae680 100644 --- a/src/beast/beast/module/sqdb/detail/statement_imp.h +++ b/src/beast/beast/module/sqdb/detail/statement_imp.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED -#define BEAST_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_STATEMENT_IMP_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/type_conversion.h b/src/beast/beast/module/sqdb/detail/type_conversion.h index 5fc4cc928c..ebe9b7699c 100644 --- a/src/beast/beast/module/sqdb/detail/type_conversion.h +++ b/src/beast/beast/module/sqdb/detail/type_conversion.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED -#define BEAST_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_TYPE_CONVERSION_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/type_ptr.h b/src/beast/beast/module/sqdb/detail/type_ptr.h index 819f98a6c1..2e768b472c 100644 --- a/src/beast/beast/module/sqdb/detail/type_ptr.h +++ b/src/beast/beast/module/sqdb/detail/type_ptr.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_TYPE_PTR_H_INCLUDED -#define BEAST_SQDB_DETAIL_TYPE_PTR_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_TYPE_PTR_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_TYPE_PTR_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/detail/use_type.h b/src/beast/beast/module/sqdb/detail/use_type.h index f07e78bfc9..a40be3d143 100644 --- a/src/beast/beast/module/sqdb/detail/use_type.h +++ b/src/beast/beast/module/sqdb/detail/use_type.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_DETAIL_USE_TYPE_H_INCLUDED -#define BEAST_SQDB_DETAIL_USE_TYPE_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_DETAIL_USE_TYPE_H_INCLUDED +#define BEAST_MODULE_SQDB_DETAIL_USE_TYPE_H_INCLUDED namespace beast { namespace sqdb { diff --git a/src/beast/beast/module/sqdb/sqdb.h b/src/beast/beast/module/sqdb/sqdb.h index aac81b93cc..17fbd93de2 100644 --- a/src/beast/beast/module/sqdb/sqdb.h +++ b/src/beast/beast/module/sqdb/sqdb.h @@ -57,8 +57,8 @@ */ //============================================================================== -#ifndef BEAST_SQDB_H_INCLUDED -#define BEAST_SQDB_H_INCLUDED +#ifndef BEAST_MODULE_SQDB_SQDB_H_INCLUDED +#define BEAST_MODULE_SQDB_SQDB_H_INCLUDED /** An embedded database wrapper with an intuitive, type-safe interface. diff --git a/src/beast/beast/module/sqlite/sqlite.h b/src/beast/beast/module/sqlite/sqlite.h index b4fca818ef..62b5ef80c7 100644 --- a/src/beast/beast/module/sqlite/sqlite.h +++ b/src/beast/beast/module/sqlite/sqlite.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SQLITE_H_INCLUDED -#define BEAST_SQLITE_H_INCLUDED +#ifndef BEAST_MODULE_SQLITE_SQLITE_H_INCLUDED +#define BEAST_MODULE_SQLITE_SQLITE_H_INCLUDED /** A self-contained, serverless, zero configuration, transactional SQL engine. diff --git a/src/beast/beast/module/sqlite/sqlite/sqlite3.h b/src/beast/beast/module/sqlite/sqlite/sqlite3.h index 431ee769f4..5147949a4b 100644 --- a/src/beast/beast/module/sqlite/sqlite/sqlite3.h +++ b/src/beast/beast/module/sqlite/sqlite/sqlite3.h @@ -30,8 +30,9 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. */ -#ifndef _SQLITE3_H_ -#define _SQLITE3_H_ +#ifndef BEAST_MODULE_SQLITE_SQLITE3_H_INCLUDED +#define BEAST_MODULE_SQLITE_SQLITE3_H_INCLUDED + #include /* Needed for the definition of va_list */ /* diff --git a/src/beast/beast/module/sqlite/sqlite/sqlite3ext.h b/src/beast/beast/module/sqlite/sqlite/sqlite3ext.h index f9a066592d..5aaccc4913 100644 --- a/src/beast/beast/module/sqlite/sqlite/sqlite3ext.h +++ b/src/beast/beast/module/sqlite/sqlite/sqlite3ext.h @@ -15,8 +15,9 @@ ** as extensions by SQLite should #include this file instead of ** sqlite3.h. */ -#ifndef _SQLITE3EXT_H_ -#define _SQLITE3EXT_H_ +#ifndef BEAST_MODULE_SQLITE_SQLITE3EXT_H_INCLUDED +#define BEAST_MODULE_SQLITE_SQLITE3EXT_H_INCLUDED + #include "sqlite3.h" typedef struct sqlite3_api_routines sqlite3_api_routines; diff --git a/src/beast/beast/nudb/detail/arena.h b/src/beast/beast/nudb/detail/arena.h index 832a2de669..6bf2695520 100644 --- a/src/beast/beast/nudb/detail/arena.h +++ b/src/beast/beast/nudb/detail/arena.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_ARENA_H_INCLUDED -#define BEAST_NUDB_ARENA_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_ARENA_H_INCLUDED +#define BEAST_NUDB_DETAIL_ARENA_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/bucket.h b/src/beast/beast/nudb/detail/bucket.h index 1b49b85b24..f7f4db43df 100644 --- a/src/beast/beast/nudb/detail/bucket.h +++ b/src/beast/beast/nudb/detail/bucket.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_BUCKET_H_INCLUDED -#define BEAST_NUDB_BUCKET_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_BUCKET_H_INCLUDED +#define BEAST_NUDB_DETAIL_BUCKET_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/buffers.h b/src/beast/beast/nudb/detail/buffers.h index 40cdb5af01..cd2cd40de2 100644 --- a/src/beast/beast/nudb/detail/buffers.h +++ b/src/beast/beast/nudb/detail/buffers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_BUFFERS_H_INCLUDED -#define BEAST_NUDB_BUFFERS_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_BUFFERS_H_INCLUDED +#define BEAST_NUDB_DETAIL_BUFFERS_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/bulkio.h b/src/beast/beast/nudb/detail/bulkio.h index e7ea76a445..92ea8219a9 100644 --- a/src/beast/beast/nudb/detail/bulkio.h +++ b/src/beast/beast/nudb/detail/bulkio.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_BULKIO_H_INCLUDED -#define BEAST_NUDB_BULKIO_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_BULKIO_H_INCLUDED +#define BEAST_NUDB_DETAIL_BULKIO_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/cache.h b/src/beast/beast/nudb/detail/cache.h index 7c2a397bda..d619d3b23a 100644 --- a/src/beast/beast/nudb/detail/cache.h +++ b/src/beast/beast/nudb/detail/cache.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_CACHE_H_INCLUDED -#define BEAST_NUDB_CACHE_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_CACHE_H_INCLUDED +#define BEAST_NUDB_DETAIL_CACHE_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/config.h b/src/beast/beast/nudb/detail/config.h index 8d8de463f0..0a40832caf 100644 --- a/src/beast/beast/nudb/detail/config.h +++ b/src/beast/beast/nudb/detail/config.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_CONFIG_H_INCLUDED -#define BEAST_NUDB_CONFIG_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_CONFIG_H_INCLUDED +#define BEAST_NUDB_DETAIL_CONFIG_H_INCLUDED #include diff --git a/src/beast/beast/nudb/detail/field.h b/src/beast/beast/nudb/detail/field.h index 7bc492c5c1..4e394b924e 100644 --- a/src/beast/beast/nudb/detail/field.h +++ b/src/beast/beast/nudb/detail/field.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_FIELD_H_INCLUDED -#define BEAST_NUDB_FIELD_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_FIELD_H_INCLUDED +#define BEAST_NUDB_DETAIL_FIELD_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/format.h b/src/beast/beast/nudb/detail/format.h index 8e41e3b100..512307f029 100644 --- a/src/beast/beast/nudb/detail/format.h +++ b/src/beast/beast/nudb/detail/format.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_FORMAT_H_INCLUDED -#define BEAST_NUDB_FORMAT_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_FORMAT_H_INCLUDED +#define BEAST_NUDB_DETAIL_FORMAT_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/gentex.h b/src/beast/beast/nudb/detail/gentex.h index bbd21d49d7..5e71f51dd5 100644 --- a/src/beast/beast/nudb/detail/gentex.h +++ b/src/beast/beast/nudb/detail/gentex.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_GENTEX_H_INCLUDED -#define BEAST_NUDB_GENTEX_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_GENTEX_H_INCLUDED +#define BEAST_NUDB_DETAIL_GENTEX_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/pool.h b/src/beast/beast/nudb/detail/pool.h index b4a80fdaa1..f0ad745645 100644 --- a/src/beast/beast/nudb/detail/pool.h +++ b/src/beast/beast/nudb/detail/pool.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_POOL_H_INCLUDED -#define BEAST_NUDB_POOL_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_POOL_H_INCLUDED +#define BEAST_NUDB_DETAIL_POOL_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/posix_file.h b/src/beast/beast/nudb/detail/posix_file.h index 81061e5d91..a70f64d669 100644 --- a/src/beast/beast/nudb/detail/posix_file.h +++ b/src/beast/beast/nudb/detail/posix_file.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_POSIX_FILE_H_INCLUDED -#define BEAST_NUDB_POSIX_FILE_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_POSIX_FILE_H_INCLUDED +#define BEAST_NUDB_DETAIL_POSIX_FILE_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/stream.h b/src/beast/beast/nudb/detail/stream.h index 93862ee37d..4d7b1fae0c 100644 --- a/src/beast/beast/nudb/detail/stream.h +++ b/src/beast/beast/nudb/detail/stream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_STREAM_H_INCLUDED -#define BEAST_NUDB_STREAM_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_STREAM_H_INCLUDED +#define BEAST_NUDB_DETAIL_STREAM_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/detail/win32_file.h b/src/beast/beast/nudb/detail/win32_file.h index d497fb517f..73f020c5fe 100644 --- a/src/beast/beast/nudb/detail/win32_file.h +++ b/src/beast/beast/nudb/detail/win32_file.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_WIN32_FILE_H_INCLUDED -#define BEAST_NUDB_WIN32_FILE_H_INCLUDED +#ifndef BEAST_NUDB_DETAIL_WIN32_FILE_H_INCLUDED +#define BEAST_NUDB_DETAIL_WIN32_FILE_H_INCLUDED #include #include diff --git a/src/beast/beast/nudb/tests/common.h b/src/beast/beast/nudb/tests/common.h index 6fd0492160..95ea8dbfd9 100644 --- a/src/beast/beast/nudb/tests/common.h +++ b/src/beast/beast/nudb/tests/common.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_NUDB_TEST_COMMON_H_INCLUDED -#define BEAST_NUDB_TEST_COMMON_H_INCLUDED +#ifndef BEAST_NUDB_COMMON_H_INCLUDED +#define BEAST_NUDB_COMMON_H_INCLUDED #include #include diff --git a/src/beast/beast/smart_ptr/SharedObject.h b/src/beast/beast/smart_ptr/SharedObject.h index bd1b6d0d9e..c26db20ac1 100644 --- a/src/beast/beast/smart_ptr/SharedObject.h +++ b/src/beast/beast/smart_ptr/SharedObject.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDOBJECT_H_INCLUDED -#define BEAST_SHAREDOBJECT_H_INCLUDED +#ifndef BEAST_SMART_PTR_SHAREDOBJECT_H_INCLUDED +#define BEAST_SMART_PTR_SHAREDOBJECT_H_INCLUDED #include diff --git a/src/beast/beast/smart_ptr/SharedPtr.h b/src/beast/beast/smart_ptr/SharedPtr.h index e1c5f70d2b..7201cc2c0b 100644 --- a/src/beast/beast/smart_ptr/SharedPtr.h +++ b/src/beast/beast/smart_ptr/SharedPtr.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED -#define BEAST_SMARTPTR_SHAREDPTR_H_INCLUDED +#ifndef BEAST_SMART_PTR_SHAREDPTR_H_INCLUDED +#define BEAST_SMART_PTR_SHAREDPTR_H_INCLUDED #include #include diff --git a/src/beast/beast/streams/abstract_ostream.h b/src/beast/beast/streams/abstract_ostream.h index 6ff1307371..a99c9171c3 100644 --- a/src/beast/beast/streams/abstract_ostream.h +++ b/src/beast/beast/streams/abstract_ostream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED -#define BEAST_UTILITY_ABSTRACT_OSTREAM_H_INCLUDED +#ifndef BEAST_STREAMS_ABSTRACT_OSTREAM_H_INCLUDED +#define BEAST_STREAMS_ABSTRACT_OSTREAM_H_INCLUDED #include diff --git a/src/beast/beast/streams/basic_std_ostream.h b/src/beast/beast/streams/basic_std_ostream.h index b8933fa103..d47839ca8c 100644 --- a/src/beast/beast/streams/basic_std_ostream.h +++ b/src/beast/beast/streams/basic_std_ostream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UTILITY_STD_OSTREAM_H_INCLUDED -#define BEAST_UTILITY_STD_OSTREAM_H_INCLUDED +#ifndef BEAST_STREAMS_BASIC_STD_OSTREAM_H_INCLUDED +#define BEAST_STREAMS_BASIC_STD_OSTREAM_H_INCLUDED #include diff --git a/src/beast/beast/streams/debug_ostream.h b/src/beast/beast/streams/debug_ostream.h index 6e23d22ab8..2d95f92b51 100644 --- a/src/beast/beast/streams/debug_ostream.h +++ b/src/beast/beast/streams/debug_ostream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED -#define BEAST_UTILITY_DEBUG_OSTREAM_H_INCLUDED +#ifndef BEAST_STREAMS_DEBUG_OSTREAM_H_INCLUDED +#define BEAST_STREAMS_DEBUG_OSTREAM_H_INCLUDED #include diff --git a/src/beast/beast/strings/CharPointer_ASCII.h b/src/beast/beast/strings/CharPointer_ASCII.h index a61c171ce5..3970bc7252 100644 --- a/src/beast/beast/strings/CharPointer_ASCII.h +++ b/src/beast/beast/strings/CharPointer_ASCII.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_ASCII_H_INCLUDED -#define BEAST_CHARPOINTER_ASCII_H_INCLUDED +#ifndef BEAST_STRINGS_CHARPOINTER_ASCII_H_INCLUDED +#define BEAST_STRINGS_CHARPOINTER_ASCII_H_INCLUDED #include diff --git a/src/beast/beast/strings/CharPointer_UTF16.h b/src/beast/beast/strings/CharPointer_UTF16.h index caf2a8b7a9..400108e9f4 100644 --- a/src/beast/beast/strings/CharPointer_UTF16.h +++ b/src/beast/beast/strings/CharPointer_UTF16.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF16_H_INCLUDED -#define BEAST_CHARPOINTER_UTF16_H_INCLUDED +#ifndef BEAST_STRINGS_CHARPOINTER_UTF16_H_INCLUDED +#define BEAST_STRINGS_CHARPOINTER_UTF16_H_INCLUDED #include #include diff --git a/src/beast/beast/strings/CharPointer_UTF32.h b/src/beast/beast/strings/CharPointer_UTF32.h index 326617d442..9b0f36e679 100644 --- a/src/beast/beast/strings/CharPointer_UTF32.h +++ b/src/beast/beast/strings/CharPointer_UTF32.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF32_H_INCLUDED -#define BEAST_CHARPOINTER_UTF32_H_INCLUDED +#ifndef BEAST_STRINGS_CHARPOINTER_UTF32_H_INCLUDED +#define BEAST_STRINGS_CHARPOINTER_UTF32_H_INCLUDED #include #include diff --git a/src/beast/beast/strings/CharPointer_UTF8.h b/src/beast/beast/strings/CharPointer_UTF8.h index 2e24ea00a7..f8f28c2903 100644 --- a/src/beast/beast/strings/CharPointer_UTF8.h +++ b/src/beast/beast/strings/CharPointer_UTF8.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF8_H_INCLUDED -#define BEAST_CHARPOINTER_UTF8_H_INCLUDED +#ifndef BEAST_STRINGS_CHARPOINTER_UTF8_H_INCLUDED +#define BEAST_STRINGS_CHARPOINTER_UTF8_H_INCLUDED #include #include diff --git a/src/beast/beast/threads/ScopedWrapperContext.h b/src/beast/beast/threads/ScopedWrapperContext.h index b8094bfdf9..ac7dee6688 100644 --- a/src/beast/beast/threads/ScopedWrapperContext.h +++ b/src/beast/beast/threads/ScopedWrapperContext.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_THREADS_WRAPSCOPED_H_INCLUDED -#define BEAST_THREADS_WRAPSCOPED_H_INCLUDED +#ifndef BEAST_THREADS_SCOPEDWRAPPERCONTEXT_H_INCLUDED +#define BEAST_THREADS_SCOPEDWRAPPERCONTEXT_H_INCLUDED namespace beast { diff --git a/src/beast/beast/threads/detail/BindHandler.h b/src/beast/beast/threads/detail/BindHandler.h index 32199b73fd..aa0fd38e38 100644 --- a/src/beast/beast/threads/detail/BindHandler.h +++ b/src/beast/beast/threads/detail/BindHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_THREADS_BINDHANDLER_H_INCLUDED -#define BEAST_THREADS_BINDHANDLER_H_INCLUDED +#ifndef BEAST_THREADS_DETAIL_BINDHANDLER_H_INCLUDED +#define BEAST_THREADS_DETAIL_BINDHANDLER_H_INCLUDED namespace beast { namespace detail { diff --git a/src/beast/beast/threads/detail/DispatchedHandler.h b/src/beast/beast/threads/detail/DispatchedHandler.h index b84e465732..c4c303dd18 100644 --- a/src/beast/beast/threads/detail/DispatchedHandler.h +++ b/src/beast/beast/threads/detail/DispatchedHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED -#define BEAST_THREADS_DISPATCHEDHANDLER_H_INCLUDED +#ifndef BEAST_THREADS_DETAIL_DISPATCHEDHANDLER_H_INCLUDED +#define BEAST_THREADS_DETAIL_DISPATCHEDHANDLER_H_INCLUDED #include diff --git a/src/beast/beast/unit_test/amount.h b/src/beast/beast/unit_test/amount.h index 25db44411f..317f5be810 100644 --- a/src/beast/beast/unit_test/amount.h +++ b/src/beast/beast/unit_test/amount.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_AMOUNT_H_INLCUDED -#define BEAST_UNIT_TEST_AMOUNT_H_INLCUDED +#ifndef BEAST_UNIT_TEST_AMOUNT_H_INCLUDED +#define BEAST_UNIT_TEST_AMOUNT_H_INCLUDED #include #include diff --git a/src/beast/beast/unit_test/match.h b/src/beast/beast/unit_test/match.h index 39833da2a4..74e77b9730 100644 --- a/src/beast/beast/unit_test/match.h +++ b/src/beast/beast/unit_test/match.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_MATCH_H_INLCUDED -#define BEAST_UNIT_TEST_MATCH_H_INLCUDED +#ifndef BEAST_UNIT_TEST_MATCH_H_INCLUDED +#define BEAST_UNIT_TEST_MATCH_H_INCLUDED #include diff --git a/src/beast/beast/unit_test/print.h b/src/beast/beast/unit_test/print.h index 01d325d621..376cc8686e 100644 --- a/src/beast/beast/unit_test/print.h +++ b/src/beast/beast/unit_test/print.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_PRINT_H_INLCUDED -#define BEAST_UNIT_TEST_PRINT_H_INLCUDED +#ifndef BEAST_UNIT_TEST_PRINT_H_INCLUDED +#define BEAST_UNIT_TEST_PRINT_H_INCLUDED #include #include diff --git a/src/beast/beast/unit_test/recorder.h b/src/beast/beast/unit_test/recorder.h index fd404faa66..b066e0cffc 100644 --- a/src/beast/beast/unit_test/recorder.h +++ b/src/beast/beast/unit_test/recorder.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_RECORDER_H_INLCUDED -#define BEAST_UNIT_TEST_RECORDER_H_INLCUDED +#ifndef BEAST_UNIT_TEST_RECORDER_H_INCLUDED +#define BEAST_UNIT_TEST_RECORDER_H_INCLUDED #include #include diff --git a/src/beast/beast/unit_test/reporter.h b/src/beast/beast/unit_test/reporter.h index e28e88f5c2..ea203ffe28 100644 --- a/src/beast/beast/unit_test/reporter.h +++ b/src/beast/beast/unit_test/reporter.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_REPORTER_H_INLCUDED -#define BEAST_UNIT_TEST_REPORTER_H_INLCUDED +#ifndef BEAST_UNIT_TEST_REPORTER_H_INCLUDED +#define BEAST_UNIT_TEST_REPORTER_H_INCLUDED #include #include diff --git a/src/beast/beast/unit_test/results.h b/src/beast/beast/unit_test/results.h index 0e4ee1e5fe..3f45840b73 100644 --- a/src/beast/beast/unit_test/results.h +++ b/src/beast/beast/unit_test/results.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UNIT_TEST_RESULTS_H_INLCUDED -#define BEAST_UNIT_TEST_RESULTS_H_INLCUDED +#ifndef BEAST_UNIT_TEST_RESULTS_H_INCLUDED +#define BEAST_UNIT_TEST_RESULTS_H_INCLUDED #include diff --git a/src/beast/beast/utility/WrappedSink.h b/src/beast/beast/utility/WrappedSink.h index 52e7d74627..18a28eeb92 100644 --- a/src/beast/beast/utility/WrappedSink.h +++ b/src/beast/beast/utility/WrappedSink.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UTILITY_WRAPPED_SINK_H_INCLUDED -#define BEAST_UTILITY_WRAPPED_SINK_H_INCLUDED +#ifndef BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED +#define BEAST_UTILITY_WRAPPEDSINK_H_INCLUDED #include diff --git a/src/beast/beast/utility/is_call_possible.h b/src/beast/beast/utility/is_call_possible.h index 182eb11cb6..25d0dfd064 100644 --- a/src/beast/beast/utility/is_call_possible.h +++ b/src/beast/beast/utility/is_call_possible.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED -#define BEAST_UTILITY_ISCALLPOSSIBLE_H_INCLUDED +#ifndef BEAST_UTILITY_IS_CALL_POSSIBLE_H_INCLUDED +#define BEAST_UTILITY_IS_CALL_POSSIBLE_H_INCLUDED #include // diff --git a/src/beast/beast/utility/maybe_const.h b/src/beast/beast/utility/maybe_const.h index 95c136b54b..3fd63c3a6c 100644 --- a/src/beast/beast/utility/maybe_const.h +++ b/src/beast/beast/utility/maybe_const.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TYPE_TRAITS_MAYBE_CONST_H_INCLUDED -#define BEAST_TYPE_TRAITS_MAYBE_CONST_H_INCLUDED +#ifndef BEAST_UTILITY_MAYBE_CONST_H_INCLUDED +#define BEAST_UTILITY_MAYBE_CONST_H_INCLUDED #include diff --git a/src/beast/beast/utility/noexcept.h b/src/beast/beast/utility/noexcept.h index 79e3a20888..8a50d0903e 100644 --- a/src/beast/beast/utility/noexcept.h +++ b/src/beast/beast/utility/noexcept.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_WORKAROUND_NOEXCEPT_H_INCLUDED -#define BEAST_WORKAROUND_NOEXCEPT_H_INCLUDED +#ifndef BEAST_UTILITY_NOEXCEPT_H_INCLUDED +#define BEAST_UTILITY_NOEXCEPT_H_INCLUDED #ifdef _MSC_VER # ifdef noexcept