diff --git a/modules/beast_asio/async/beast_ComposedAsyncOperation.h b/modules/beast_asio/async/beast_ComposedAsyncOperation.h index ca109ebd96..54fffe055f 100644 --- a/modules/beast_asio/async/beast_ComposedAsyncOperation.h +++ b/modules/beast_asio/async/beast_ComposedAsyncOperation.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_COMPOSEDASYNCOPERATION_H_INCLUDED -#define BEAST_COMPOSEDASYNCOPERATION_H_INCLUDED +#ifndef BEAST_ASIO_ASYNC_COMPOSEDASYNCOPERATION_H_INCLUDED +#define BEAST_ASIO_ASYNC_COMPOSEDASYNCOPERATION_H_INCLUDED /** Base class for creating composed asynchronous operations. The composed operation will have its operator() overloads called with diff --git a/modules/beast_asio/async/beast_SharedHandler.h b/modules/beast_asio/async/beast_SharedHandler.h index 6e2d4f2f8b..f8a1be9d1a 100644 --- a/modules/beast_asio/async/beast_SharedHandler.h +++ b/modules/beast_asio/async/beast_SharedHandler.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDHANDLER_H_INCLUDED -#define BEAST_SHAREDHANDLER_H_INCLUDED +#ifndef BEAST_ASIO_ASYNC_SHAREDHANDLER_H_INCLUDED +#define BEAST_ASIO_ASYNC_SHAREDHANDLER_H_INCLUDED template struct SharedHandlerAllocator; diff --git a/modules/beast_asio/async/beast_SharedHandlerAllocator.h b/modules/beast_asio/async/beast_SharedHandlerAllocator.h index 404d12a9b2..1a262a8c37 100644 --- a/modules/beast_asio/async/beast_SharedHandlerAllocator.h +++ b/modules/beast_asio/async/beast_SharedHandlerAllocator.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDHANDLERALLOCATOR_H_INCLUDED -#define BEAST_SHAREDHANDLERALLOCATOR_H_INCLUDED +#ifndef BEAST_ASIO_ASYNC_SHAREDHANDLERALLOCATOR_H_INCLUDED +#define BEAST_ASIO_ASYNC_SHAREDHANDLERALLOCATOR_H_INCLUDED /** Custom Allocator using the allocation hooks from the Handler. diff --git a/modules/beast_asio/async/beast_SharedHandlerPtr.h b/modules/beast_asio/async/beast_SharedHandlerPtr.h index b6a6ef4fe0..5672fd9760 100644 --- a/modules/beast_asio/async/beast_SharedHandlerPtr.h +++ b/modules/beast_asio/async/beast_SharedHandlerPtr.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDHANDLERPTR_H_INCLUDED -#define BEAST_SHAREDHANDLERPTR_H_INCLUDED +#ifndef BEAST_ASIO_ASYNC_SHAREDHANDLERPTR_H_INCLUDED +#define BEAST_ASIO_ASYNC_SHAREDHANDLERPTR_H_INCLUDED /** RAII container for a SharedHandler. diff --git a/modules/beast_asio/async/beast_SharedHandlerType.h b/modules/beast_asio/async/beast_SharedHandlerType.h index bb7bca2a0f..90ffc068e5 100644 --- a/modules/beast_asio/async/beast_SharedHandlerType.h +++ b/modules/beast_asio/async/beast_SharedHandlerType.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDHANDLERTYPE_H_INCLUDED -#define BEAST_SHAREDHANDLERTYPE_H_INCLUDED +#ifndef BEAST_ASIO_ASYNC_SHAREDHANDLERTYPE_H_INCLUDED +#define BEAST_ASIO_ASYNC_SHAREDHANDLERTYPE_H_INCLUDED /** An instance of SharedHandler that wraps an existing Handler. diff --git a/modules/beast_asio/basics/beast_BufferType.h b/modules/beast_asio/basics/beast_BufferType.h index 14b972f4f2..99b9065b29 100644 --- a/modules/beast_asio/basics/beast_BufferType.h +++ b/modules/beast_asio/basics/beast_BufferType.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_BUFFERTYPE_H_INCLUDED -#define BEAST_BUFFERTYPE_H_INCLUDED +#ifndef BEAST_ASIO_BASICS_BUFFERTYPE_H_INCLUDED +#define BEAST_ASIO_BASICS_BUFFERTYPE_H_INCLUDED /** Storage for a BufferSequence. diff --git a/modules/beast_asio/basics/beast_FixedInputBuffer.h b/modules/beast_asio/basics/beast_FixedInputBuffer.h index a7c06d6e71..a0df23f8cd 100644 --- a/modules/beast_asio/basics/beast_FixedInputBuffer.h +++ b/modules/beast_asio/basics/beast_FixedInputBuffer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FIXEDINPUTBUFFER_H_INCLUDED -#define BEAST_FIXEDINPUTBUFFER_H_INCLUDED +#ifndef BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED +#define BEAST_ASIO_BASICS_FIXEDINPUTBUFFER_H_INCLUDED /** Represents a small, fixed size buffer. This provides a convenient interface for doing a bytewise diff --git a/modules/beast_asio/basics/beast_PeerRole.h b/modules/beast_asio/basics/beast_PeerRole.h index 9e865b2d50..3ef7d219a6 100644 --- a/modules/beast_asio/basics/beast_PeerRole.h +++ b/modules/beast_asio/basics/beast_PeerRole.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_PEERROLE_H_INCLUDED -#define BEAST_PEERROLE_H_INCLUDED +#ifndef BEAST_ASIO_BASICS_PEERROLE_H_INCLUDED +#define BEAST_ASIO_BASICS_PEERROLE_H_INCLUDED /** Identifies if the peer is a client or a server. */ struct PeerRole diff --git a/modules/beast_asio/handshake/beast_HandshakeDetectLogic.h b/modules/beast_asio/handshake/beast_HandshakeDetectLogic.h index 8855928e25..d93ad6ae2b 100644 --- a/modules/beast_asio/handshake/beast_HandshakeDetectLogic.h +++ b/modules/beast_asio/handshake/beast_HandshakeDetectLogic.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HANDSHAKEDETECTLOGIC_H_INCLUDED -#define BEAST_HANDSHAKEDETECTLOGIC_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGIC_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGIC_H_INCLUDED class HandshakeDetectLogic { diff --git a/modules/beast_asio/handshake/beast_HandshakeDetectLogicPROXY.h b/modules/beast_asio/handshake/beast_HandshakeDetectLogicPROXY.h index 24a84e2e13..51456d35a4 100644 --- a/modules/beast_asio/handshake/beast_HandshakeDetectLogicPROXY.h +++ b/modules/beast_asio/handshake/beast_HandshakeDetectLogicPROXY.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED -#define BEAST_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICPROXY_H_INCLUDED /** Handshake detector for the PROXY protcol diff --git a/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL2.h b/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL2.h index 47a6d68dfd..c2f20054fb 100644 --- a/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL2.h +++ b/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL2.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HANDSHAKEDETECTLOGICSSL2_H_INCLUDED -#define BEAST_HANDSHAKEDETECTLOGICSSL2_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICSSL2_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICSSL2_H_INCLUDED // Handshake for SSL 2 // diff --git a/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL3.h b/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL3.h index 839c053c26..226ec43c35 100644 --- a/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL3.h +++ b/modules/beast_asio/handshake/beast_HandshakeDetectLogicSSL3.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HANDSHAKEDETECTLOGICSSL3_H_INCLUDED -#define BEAST_HANDSHAKEDETECTLOGICSSL3_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICSSL3_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTLOGICSSL3_H_INCLUDED // Handshake for SSL 3 (Also TLS 1.0 and 1.1) // diff --git a/modules/beast_asio/handshake/beast_HandshakeDetector.h b/modules/beast_asio/handshake/beast_HandshakeDetector.h index a53296ba64..6a93d8b9d2 100644 --- a/modules/beast_asio/handshake/beast_HandshakeDetector.h +++ b/modules/beast_asio/handshake/beast_HandshakeDetector.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_HANDSHAKEDETECTOR_H_INCLUDED -#define BEAST_HANDSHAKEDETECTOR_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_HANDSHAKEDETECTOR_H_INCLUDED //------------------------------------------------------------------------------ diff --git a/modules/beast_asio/handshake/beast_InputParser.h b/modules/beast_asio/handshake/beast_InputParser.h index fb19516994..31474a2ec6 100644 --- a/modules/beast_asio/handshake/beast_InputParser.h +++ b/modules/beast_asio/handshake/beast_InputParser.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_INPUTPARSER_H_INCLUDED -#define BEAST_INPUTPARSER_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED namespace InputParser { diff --git a/modules/beast_asio/handshake/beast_PrefilledReadStream.h b/modules/beast_asio/handshake/beast_PrefilledReadStream.h index 0450d84e1e..65cdb794fa 100644 --- a/modules/beast_asio/handshake/beast_PrefilledReadStream.h +++ b/modules/beast_asio/handshake/beast_PrefilledReadStream.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_PREFILLEDREADSTREAM_H_INCLUDED -#define BEAST_PREFILLEDREADSTREAM_H_INCLUDED +#ifndef BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED +#define BEAST_ASIO_HANDSHAKE_PREFILLEDREADSTREAM_H_INCLUDED /** Front-ends a stream with a provided block of data. diff --git a/modules/beast_asio/sockets/beast_Socket.h b/modules/beast_asio/sockets/beast_Socket.h index a7fc45a573..963563e31f 100644 --- a/modules/beast_asio/sockets/beast_Socket.h +++ b/modules/beast_asio/sockets/beast_Socket.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SOCKET_H_INCLUDED -#define BEAST_SOCKET_H_INCLUDED +#ifndef BEAST_ASIO_SOCKETS_SOCKET_H_INCLUDED +#define BEAST_ASIO_SOCKETS_SOCKET_H_INCLUDED /** A high level socket abstraction. diff --git a/modules/beast_asio/sockets/beast_SocketBase.h b/modules/beast_asio/sockets/beast_SocketBase.h index 5c327cd9ce..2881589bd0 100644 --- a/modules/beast_asio/sockets/beast_SocketBase.h +++ b/modules/beast_asio/sockets/beast_SocketBase.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SOCKETBASE_H_INCLUDED -#define BEAST_SOCKETBASE_H_INCLUDED +#ifndef BEAST_ASIO_SOCKETS_SOCKETBASE_H_INCLUDED +#define BEAST_ASIO_SOCKETS_SOCKETBASE_H_INCLUDED /** Common implementation details for Socket and related classes. Normally you wont need to use this. diff --git a/modules/beast_asio/sockets/beast_SocketWrapper.h b/modules/beast_asio/sockets/beast_SocketWrapper.h index ea2f671662..b93ee8ea9f 100644 --- a/modules/beast_asio/sockets/beast_SocketWrapper.h +++ b/modules/beast_asio/sockets/beast_SocketWrapper.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SOCKETWRAPPER_H_INCLUDED -#define BEAST_SOCKETWRAPPER_H_INCLUDED +#ifndef BEAST_ASIO_SOCKETS_SOCKETWRAPPER_H_INCLUDED +#define BEAST_ASIO_SOCKETS_SOCKETWRAPPER_H_INCLUDED /** Wraps a reference to any object and exports all availble interfaces. diff --git a/modules/beast_asio/system/BoostIncludes.h b/modules/beast_asio/system/BoostIncludes.h index 7f7970247e..2691d63c77 100644 --- a/modules/beast_asio/system/BoostIncludes.h +++ b/modules/beast_asio/system/BoostIncludes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_BOOSTINCLUDES_H_INCLUDED -#define BEAST_BOOSTINCLUDES_H_INCLUDED +#ifndef BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED +#define BEAST_ASIO_SYSTEM_BOOSTINCLUDES_H_INCLUDED // Make sure we take care of fixing boost::bind oddities first. #if !defined(BEAST_CORE_H_INCLUDED) diff --git a/modules/beast_asio/system/beast_OpenSSLIncludes.h b/modules/beast_asio/system/beast_OpenSSLIncludes.h index 92133891ca..20aebf1e50 100644 --- a/modules/beast_asio/system/beast_OpenSSLIncludes.h +++ b/modules/beast_asio/system/beast_OpenSSLIncludes.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_OPENSSLINCLUDES_H_INCLUDED -#define BEAST_OPENSSLINCLUDES_H_INCLUDED +#ifndef BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED +#define BEAST_ASIO_SYSTEM_OPENSSLINCLUDES_H_INCLUDED #define OPENSSL_THREAD_DEFINES #include diff --git a/modules/beast_asio/tests/beast_PeerTest.h b/modules/beast_asio/tests/beast_PeerTest.h index e47f29e33c..7f406dab1c 100644 --- a/modules/beast_asio/tests/beast_PeerTest.h +++ b/modules/beast_asio/tests/beast_PeerTest.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PEERTEST_H_INCLUDED -#define RIPPLE_PEERTEST_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED +#define BEAST_ASIO_TESTS_PEERTEST_H_INCLUDED /** Performs a test of two peers defined by template parameters. */ diff --git a/modules/beast_asio/tests/beast_TestPeer.h b/modules/beast_asio/tests/beast_TestPeer.h index 30a01d89c8..818c2dd375 100644 --- a/modules/beast_asio/tests/beast_TestPeer.h +++ b/modules/beast_asio/tests/beast_TestPeer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEER_H_INCLUDED -#define BEAST_TESTPEER_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEER_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEER_H_INCLUDED /** An abstract peer for unit tests. */ diff --git a/modules/beast_asio/tests/beast_TestPeerBasics.h b/modules/beast_asio/tests/beast_TestPeerBasics.h index e4cd908d18..6047e8a109 100644 --- a/modules/beast_asio/tests/beast_TestPeerBasics.h +++ b/modules/beast_asio/tests/beast_TestPeerBasics.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERBASICS_H_INCLUDED -#define BEAST_TESTPEERBASICS_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERBASICS_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERBASICS_H_INCLUDED /** Common declarations for TestPeer. diff --git a/modules/beast_asio/tests/beast_TestPeerDetails.h b/modules/beast_asio/tests/beast_TestPeerDetails.h index c03f4bd2ba..8ad8b92840 100644 --- a/modules/beast_asio/tests/beast_TestPeerDetails.h +++ b/modules/beast_asio/tests/beast_TestPeerDetails.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERDETAILS_H_INCLUDED -#define BEAST_TESTPEERDETAILS_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERDETAILS_H_INCLUDED /** Base class of all detail objects. */ diff --git a/modules/beast_asio/tests/beast_TestPeerDetailsTcp.h b/modules/beast_asio/tests/beast_TestPeerDetailsTcp.h index eef55745e8..8e64ca49c5 100644 --- a/modules/beast_asio/tests/beast_TestPeerDetailsTcp.h +++ b/modules/beast_asio/tests/beast_TestPeerDetailsTcp.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERDETAILSTCP_H_INCLUDED -#define BEAST_TESTPEERDETAILSTCP_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERDETAILSTCP_H_INCLUDED /** Some predefined Detail classes for TestPeer */ diff --git a/modules/beast_asio/tests/beast_TestPeerLogic.h b/modules/beast_asio/tests/beast_TestPeerLogic.h index f281d09e23..09d0a6bdc6 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogic.h +++ b/modules/beast_asio/tests/beast_TestPeerLogic.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGIC_H_INCLUDED -#define BEAST_TESTPEERLOGIC_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGIC_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGIC_H_INCLUDED /** Interface for implementing the logic part of a peer test. */ diff --git a/modules/beast_asio/tests/beast_TestPeerLogicAsyncClient.h b/modules/beast_asio/tests/beast_TestPeerLogicAsyncClient.h index 070e034abe..190921e2f8 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogicAsyncClient.h +++ b/modules/beast_asio/tests/beast_TestPeerLogicAsyncClient.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGICASYNCCLIENT_H_INCLUDED -#define BEAST_TESTPEERLOGICASYNCCLIENT_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGICASYNCCLIENT_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGICASYNCCLIENT_H_INCLUDED class TestPeerLogicAsyncClient : public TestPeerLogic { diff --git a/modules/beast_asio/tests/beast_TestPeerLogicAsyncServer.h b/modules/beast_asio/tests/beast_TestPeerLogicAsyncServer.h index 43d453e80e..e90066e4e2 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogicAsyncServer.h +++ b/modules/beast_asio/tests/beast_TestPeerLogicAsyncServer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGICASYNCSERVER_H_INCLUDED -#define BEAST_TESTPEERLOGICASYNCSERVER_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGICASYNCSERVER_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGICASYNCSERVER_H_INCLUDED class TestPeerLogicAsyncServer : public TestPeerLogic { diff --git a/modules/beast_asio/tests/beast_TestPeerLogicProxyClient.h b/modules/beast_asio/tests/beast_TestPeerLogicProxyClient.h index fd1829adc0..25cc6017c7 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogicProxyClient.h +++ b/modules/beast_asio/tests/beast_TestPeerLogicProxyClient.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGICPROXYCLIENT_H_INCLUDED -#define BEAST_TESTPEERLOGICPROXYCLIENT_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGICPROXYCLIENT_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGICPROXYCLIENT_H_INCLUDED /** A synchronous client logic that sends a PROXY protocol pre-handshake. */ class TestPeerLogicProxyClient : public TestPeerLogicSyncClient diff --git a/modules/beast_asio/tests/beast_TestPeerLogicSyncClient.h b/modules/beast_asio/tests/beast_TestPeerLogicSyncClient.h index 61cd29b393..9ad4eff120 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogicSyncClient.h +++ b/modules/beast_asio/tests/beast_TestPeerLogicSyncClient.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGICSYNCCLIENT_H_INCLUDED -#define BEAST_TESTPEERLOGICSYNCCLIENT_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGICSYNCCLIENT_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGICSYNCCLIENT_H_INCLUDED class TestPeerLogicSyncClient : public TestPeerLogic { diff --git a/modules/beast_asio/tests/beast_TestPeerLogicSyncServer.h b/modules/beast_asio/tests/beast_TestPeerLogicSyncServer.h index b6f8bccb52..8a1de9b13d 100644 --- a/modules/beast_asio/tests/beast_TestPeerLogicSyncServer.h +++ b/modules/beast_asio/tests/beast_TestPeerLogicSyncServer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERLOGICSYNCSERVER_H_INCLUDED -#define BEAST_TESTPEERLOGICSYNCSERVER_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERLOGICSYNCSERVER_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERLOGICSYNCSERVER_H_INCLUDED class TestPeerLogicSyncServer : public TestPeerLogic { diff --git a/modules/beast_asio/tests/beast_TestPeerType.h b/modules/beast_asio/tests/beast_TestPeerType.h index 559eaca343..17ed4d68e8 100644 --- a/modules/beast_asio/tests/beast_TestPeerType.h +++ b/modules/beast_asio/tests/beast_TestPeerType.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_TESTPEERTYPE_H_INCLUDED -#define BEAST_TESTPEERTYPE_H_INCLUDED +#ifndef BEAST_ASIO_TESTS_TESTPEERTYPE_H_INCLUDED +#define BEAST_ASIO_TESTS_TESTPEERTYPE_H_INCLUDED template class TestPeerType diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.cpp index 8935ceed16..7e3776b774 100644 --- a/modules/beast_core/beast_core.cpp +++ b/modules/beast_core/beast_core.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -#if defined (BEAST_CORE_BEASTHEADER) && ! BEAST_AMALGAMATED_INCLUDE +#if defined BEAST_CORE_H_INCLUDED /* When you add this cpp file to your project, you mustn't include it in a file where you've already included any other headers - just put it inside a file on its own, possibly with your config flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h index 89a865a367..5d233fc627 100644 --- a/modules/beast_core/beast_core.h +++ b/modules/beast_core/beast_core.h @@ -259,6 +259,10 @@ Some files contain portions of these external projects, licensed separately: //#define BEAST_CATCH_UNHANDLED_EXCEPTIONS 1 #endif +#ifndef BEAST_STRING_UTF_TYPE +# define BEAST_STRING_UTF_TYPE 8 +#endif + #include "system/BoostIncludes.h" #include "system/BindIncludes.h" @@ -307,19 +311,45 @@ Some files contain portions of these external projects, licensed separately: namespace beast { +class MemoryBlock; +class File; +class InputStream; +class OutputStream; +class DynamicObject; +class FileInputStream; +class FileOutputStream; +class XmlElement; +class JSONFormatter; + +extern BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger(); +extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) noexcept; + // Order matters, since headers don't have their own #include lines. // Add new includes to the bottom. #include "memory/beast_Uncopyable.h" +#include "memory/beast_Memory.h" +#include "maths/beast_MathsFunctions.h" +#include "memory/beast_ByteOrder.h" +#include "memory/beast_Atomic.h" +#include "text/beast_CharacterFunctions.h" + +#if BEAST_MSVC +# pragma warning (push) +# pragma warning (disable: 4514 4996) +#endif +#include "text/beast_CharPointer_UTF8.h" +#include "text/beast_CharPointer_UTF16.h" +#include "text/beast_CharPointer_UTF32.h" +#include "text/beast_CharPointer_ASCII.h" +#if BEAST_MSVC +# pragma warning (pop) +#endif #include "system/beast_PlatformDefs.h" #include "system/beast_TargetPlatform.h" - #include "diagnostic/beast_Throw.h" #include "system/beast_Functional.h" - -#include "maths/beast_MathsFunctions.h" -#include "memory/beast_Atomic.h" #include "memory/beast_AtomicCounter.h" #include "memory/beast_AtomicFlag.h" #include "memory/beast_AtomicPointer.h" @@ -328,10 +358,7 @@ namespace beast #include "containers/beast_LockFreeStack.h" #include "threads/beast_SpinDelay.h" #include "memory/beast_StaticObject.h" -#include "memory/beast_Memory.h" - #include "text/beast_String.h" - #include "memory/beast_MemoryAlignment.h" #include "memory/beast_CacheLine.h" #include "threads/beast_CriticalSection.h" @@ -344,7 +371,6 @@ namespace beast #include "threads/beast_Thread.h" #include "threads/beast_SpinLock.h" #include "threads/beast_ThreadLocalValue.h" - #include "thread/MutexTraits.h" #include "containers/beast_Array.h" #include "text/beast_StringArray.h" @@ -352,16 +378,8 @@ namespace beast #include "diagnostic/beast_FatalError.h" #include "diagnostic/beast_Error.h" #include "diagnostic/beast_Debug.h" - -#include "text/beast_CharacterFunctions.h" -#include "text/beast_CharPointer_ASCII.h" -#include "text/beast_CharPointer_UTF16.h" -#include "text/beast_CharPointer_UTF32.h" -#include "text/beast_CharPointer_UTF8.h" #include "text/beast_LexicalCast.h" - #include "memory/beast_ContainerDeletePolicy.h" -#include "memory/beast_ByteOrder.h" #include "memory/beast_ByteSwap.h" #include "maths/beast_Math.h" #include "maths/beast_uint24.h" @@ -384,6 +402,7 @@ namespace beast #include "containers/beast_SharedTable.h" #include "containers/beast_SortedLookupTable.h" #include "containers/beast_SortedSet.h" +#include "maths/beast_Range.h" #include "containers/beast_SparseSet.h" #include "containers/beast_Variant.h" #include "files/beast_DirectoryIterator.h" @@ -402,7 +421,6 @@ namespace beast #include "maths/beast_Interval.h" #include "maths/beast_MathsFunctions.h" #include "maths/beast_MurmurHash.h" -#include "maths/beast_Range.h" #include "memory/beast_ByteOrder.h" #include "memory/beast_HeapBlock.h" #include "memory/beast_Memory.h" diff --git a/modules/beast_core/containers/beast_AbstractFifo.h b/modules/beast_core/containers/beast_AbstractFifo.h index f90fea25f2..f7196a1a38 100644 --- a/modules/beast_core/containers/beast_AbstractFifo.h +++ b/modules/beast_core/containers/beast_AbstractFifo.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ABSTRACTFIFO_BEASTHEADER -#define BEAST_ABSTRACTFIFO_BEASTHEADER +#ifndef BEAST_ABSTRACTFIFO_H_INCLUDED +#define BEAST_ABSTRACTFIFO_H_INCLUDED //============================================================================== /** diff --git a/modules/beast_core/containers/beast_Array.h b/modules/beast_core/containers/beast_Array.h index 6feb2fdc13..e8f79f4372 100644 --- a/modules/beast_core/containers/beast_Array.h +++ b/modules/beast_core/containers/beast_Array.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ARRAY_BEASTHEADER -#define BEAST_ARRAY_BEASTHEADER +#ifndef BEAST_ARRAY_H_INCLUDED +#define BEAST_ARRAY_H_INCLUDED #include "beast_ArrayAllocationBase.h" #include "beast_ElementComparator.h" @@ -1057,4 +1057,4 @@ private: } }; -#endif // BEAST_ARRAY_BEASTHEADER +#endif // BEAST_ARRAY_H_INCLUDED diff --git a/modules/beast_core/containers/beast_ArrayAllocationBase.h b/modules/beast_core/containers/beast_ArrayAllocationBase.h index 1cd2346d62..a0cdc1cfe0 100644 --- a/modules/beast_core/containers/beast_ArrayAllocationBase.h +++ b/modules/beast_core/containers/beast_ArrayAllocationBase.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ARRAYALLOCATIONBASE_BEASTHEADER -#define BEAST_ARRAYALLOCATIONBASE_BEASTHEADER +#ifndef BEAST_ARRAYALLOCATIONBASE_H_INCLUDED +#define BEAST_ARRAYALLOCATIONBASE_H_INCLUDED #include "../memory/beast_HeapBlock.h" @@ -129,4 +129,4 @@ public: int numAllocated; }; -#endif // BEAST_ARRAYALLOCATIONBASE_BEASTHEADER +#endif // BEAST_ARRAYALLOCATIONBASE_H_INCLUDED diff --git a/modules/beast_core/containers/beast_DynamicObject.h b/modules/beast_core/containers/beast_DynamicObject.h index 2b411c3cd8..87ba4c0b70 100644 --- a/modules/beast_core/containers/beast_DynamicObject.h +++ b/modules/beast_core/containers/beast_DynamicObject.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_DYNAMICOBJECT_BEASTHEADER -#define BEAST_DYNAMICOBJECT_BEASTHEADER +#ifndef BEAST_DYNAMICOBJECT_H_INCLUDED +#define BEAST_DYNAMICOBJECT_H_INCLUDED #include "beast_NamedValueSet.h" #include "../memory/beast_SharedObject.h" @@ -118,4 +118,4 @@ private: -#endif // BEAST_DYNAMICOBJECT_BEASTHEADER +#endif // BEAST_DYNAMICOBJECT_H_INCLUDED diff --git a/modules/beast_core/containers/beast_ElementComparator.h b/modules/beast_core/containers/beast_ElementComparator.h index 7ad71b3ea7..ca63eaf6b8 100644 --- a/modules/beast_core/containers/beast_ElementComparator.h +++ b/modules/beast_core/containers/beast_ElementComparator.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ELEMENTCOMPARATOR_BEASTHEADER -#define BEAST_ELEMENTCOMPARATOR_BEASTHEADER +#ifndef BEAST_ELEMENTCOMPARATOR_H_INCLUDED +#define BEAST_ELEMENTCOMPARATOR_H_INCLUDED //============================================================================== @@ -271,4 +271,4 @@ public: }; -#endif // BEAST_ELEMENTCOMPARATOR_BEASTHEADER +#endif // BEAST_ELEMENTCOMPARATOR_H_INCLUDED diff --git a/modules/beast_core/containers/beast_HashMap.h b/modules/beast_core/containers/beast_HashMap.h index 6438bb3542..75eebdbfa4 100644 --- a/modules/beast_core/containers/beast_HashMap.h +++ b/modules/beast_core/containers/beast_HashMap.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_HASHMAP_BEASTHEADER -#define BEAST_HASHMAP_BEASTHEADER +#ifndef BEAST_HASHMAP_H_INCLUDED +#define BEAST_HASHMAP_H_INCLUDED #include "beast_OwnedArray.h" #include "beast_LinkedListPointer.h" @@ -484,4 +484,4 @@ private: }; -#endif // BEAST_HASHMAP_BEASTHEADER +#endif // BEAST_HASHMAP_H_INCLUDED diff --git a/modules/beast_core/containers/beast_LinkedListPointer.h b/modules/beast_core/containers/beast_LinkedListPointer.h index 4d04ebe491..b55f2e9939 100644 --- a/modules/beast_core/containers/beast_LinkedListPointer.h +++ b/modules/beast_core/containers/beast_LinkedListPointer.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_LINKEDLISTPOINTER_BEASTHEADER -#define BEAST_LINKEDLISTPOINTER_BEASTHEADER +#ifndef BEAST_LINKEDLISTPOINTER_H_INCLUDED +#define BEAST_LINKEDLISTPOINTER_H_INCLUDED //============================================================================== @@ -359,4 +359,4 @@ private: }; -#endif // BEAST_LINKEDLISTPOINTER_BEASTHEADER +#endif // BEAST_LINKEDLISTPOINTER_H_INCLUDED diff --git a/modules/beast_core/containers/beast_LockFreeQueue.h b/modules/beast_core/containers/beast_LockFreeQueue.h index 64b83065ba..7c3e0e5999 100644 --- a/modules/beast_core/containers/beast_LockFreeQueue.h +++ b/modules/beast_core/containers/beast_LockFreeQueue.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_LOCKFREEQUEUE_BEASTHEADER -#define BEAST_LOCKFREEQUEUE_BEASTHEADER +#ifndef BEAST_LOCKFREEQUEUE_H_INCLUDED +#define BEAST_LOCKFREEQUEUE_H_INCLUDED /** Default tag for LockFreeQueue diff --git a/modules/beast_core/containers/beast_LockFreeStack.h b/modules/beast_core/containers/beast_LockFreeStack.h index c4b24739ff..f09261d022 100644 --- a/modules/beast_core/containers/beast_LockFreeStack.h +++ b/modules/beast_core/containers/beast_LockFreeStack.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_LOCKFREESTACK_BEASTHEADER -#define BEAST_LOCKFREESTACK_BEASTHEADER +#ifndef BEAST_LOCKFREESTACK_H_INCLUDED +#define BEAST_LOCKFREESTACK_H_INCLUDED struct LockFreeStackDefaultTag; diff --git a/modules/beast_core/containers/beast_NamedValueSet.h b/modules/beast_core/containers/beast_NamedValueSet.h index b451832f83..486e44c986 100644 --- a/modules/beast_core/containers/beast_NamedValueSet.h +++ b/modules/beast_core/containers/beast_NamedValueSet.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_NAMEDVALUESET_BEASTHEADER -#define BEAST_NAMEDVALUESET_BEASTHEADER +#ifndef BEAST_NAMEDVALUESET_H_INCLUDED +#define BEAST_NAMEDVALUESET_H_INCLUDED #include "beast_Variant.h" #include "../containers/beast_LinkedListPointer.h" @@ -160,4 +160,4 @@ private: }; -#endif // BEAST_NAMEDVALUESET_BEASTHEADER +#endif // BEAST_NAMEDVALUESET_H_INCLUDED diff --git a/modules/beast_core/containers/beast_OwnedArray.h b/modules/beast_core/containers/beast_OwnedArray.h index 8004e6801a..52b31cbb88 100644 --- a/modules/beast_core/containers/beast_OwnedArray.h +++ b/modules/beast_core/containers/beast_OwnedArray.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OWNEDARRAY_BEASTHEADER -#define BEAST_OWNEDARRAY_BEASTHEADER +#ifndef BEAST_OWNEDARRAY_H_INCLUDED +#define BEAST_OWNEDARRAY_H_INCLUDED //============================================================================== /** An array designed for holding objects. diff --git a/modules/beast_core/containers/beast_PropertySet.h b/modules/beast_core/containers/beast_PropertySet.h index c3b5e61c8f..c0c5877386 100644 --- a/modules/beast_core/containers/beast_PropertySet.h +++ b/modules/beast_core/containers/beast_PropertySet.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_PROPERTYSET_BEASTHEADER -#define BEAST_PROPERTYSET_BEASTHEADER +#ifndef BEAST_PROPERTYSET_H_INCLUDED +#define BEAST_PROPERTYSET_H_INCLUDED #include "../text/beast_StringPairArray.h" #include "../xml/beast_XmlElement.h" @@ -209,4 +209,4 @@ private: }; -#endif // BEAST_PROPERTYSET_BEASTHEADER +#endif // BEAST_PROPERTYSET_H_INCLUDED diff --git a/modules/beast_core/containers/beast_ScopedValueSetter.h b/modules/beast_core/containers/beast_ScopedValueSetter.h index 840dbd8041..ff10da1315 100644 --- a/modules/beast_core/containers/beast_ScopedValueSetter.h +++ b/modules/beast_core/containers/beast_ScopedValueSetter.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDVALUESETTER_BEASTHEADER -#define BEAST_SCOPEDVALUESETTER_BEASTHEADER +#ifndef BEAST_SCOPEDVALUESETTER_H_INCLUDED +#define BEAST_SCOPEDVALUESETTER_H_INCLUDED //============================================================================== @@ -90,4 +90,4 @@ private: }; -#endif // BEAST_SCOPEDVALUESETTER_BEASTHEADER +#endif // BEAST_SCOPEDVALUESETTER_H_INCLUDED diff --git a/modules/beast_core/containers/beast_SharedTable.h b/modules/beast_core/containers/beast_SharedTable.h index 2d375a7f45..890a1f0ca0 100644 --- a/modules/beast_core/containers/beast_SharedTable.h +++ b/modules/beast_core/containers/beast_SharedTable.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SHAREDTABLE_BEASTHEADER -#define BEAST_SHAREDTABLE_BEASTHEADER +#ifndef BEAST_SHAREDTABLE_H_INCLUDED +#define BEAST_SHAREDTABLE_H_INCLUDED /** Handle to a reference counted fixed size table. diff --git a/modules/beast_core/containers/beast_SortedLookupTable.h b/modules/beast_core/containers/beast_SortedLookupTable.h index af5ce63902..e45185bb79 100644 --- a/modules/beast_core/containers/beast_SortedLookupTable.h +++ b/modules/beast_core/containers/beast_SortedLookupTable.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SORTEDLOOKUPTABLE_BEASTHEADER -#define BEAST_SORTEDLOOKUPTABLE_BEASTHEADER +#ifndef BEAST_SORTEDLOOKUPTABLE_H_INCLUDED +#define BEAST_SORTEDLOOKUPTABLE_H_INCLUDED /** Sorted map for fast lookups. diff --git a/modules/beast_core/containers/beast_SortedSet.h b/modules/beast_core/containers/beast_SortedSet.h index 3227892cad..c2d21d2d30 100644 --- a/modules/beast_core/containers/beast_SortedSet.h +++ b/modules/beast_core/containers/beast_SortedSet.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SORTEDSET_BEASTHEADER -#define BEAST_SORTEDSET_BEASTHEADER +#ifndef BEAST_SORTEDSET_H_INCLUDED +#define BEAST_SORTEDSET_H_INCLUDED #include "beast_ArrayAllocationBase.h" #include "../threads/beast_CriticalSection.h" @@ -492,4 +492,4 @@ private: #pragma warning (pop) #endif -#endif // BEAST_SORTEDSET_BEASTHEADER +#endif // BEAST_SORTEDSET_H_INCLUDED diff --git a/modules/beast_core/containers/beast_SparseSet.h b/modules/beast_core/containers/beast_SparseSet.h index 129c26d6eb..807a75038e 100644 --- a/modules/beast_core/containers/beast_SparseSet.h +++ b/modules/beast_core/containers/beast_SparseSet.h @@ -21,12 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SPARSESET_BEASTHEADER -#define BEAST_SPARSESET_BEASTHEADER - -#include "../maths/beast_Range.h" -#include "../threads/beast_CriticalSection.h" - +#ifndef BEAST_SPARSESET_H_INCLUDED +#define BEAST_SPARSESET_H_INCLUDED //============================================================================== /** @@ -293,4 +289,4 @@ private: -#endif // BEAST_SPARSESET_BEASTHEADER +#endif // BEAST_SPARSESET_H_INCLUDED diff --git a/modules/beast_core/containers/beast_Variant.h b/modules/beast_core/containers/beast_Variant.h index b362b60989..c6b5adf299 100644 --- a/modules/beast_core/containers/beast_Variant.h +++ b/modules/beast_core/containers/beast_Variant.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_VARIANT_BEASTHEADER -#define BEAST_VARIANT_BEASTHEADER +#ifndef BEAST_VARIANT_H_INCLUDED +#define BEAST_VARIANT_H_INCLUDED #include "../text/beast_Identifier.h" #include "../streams/beast_OutputStream.h" @@ -299,4 +299,4 @@ bool operator== (const var& v1, const char* v2); bool operator!= (const var& v1, const char* v2); -#endif // BEAST_VARIANT_BEASTHEADER +#endif // BEAST_VARIANT_H_INCLUDED diff --git a/modules/beast_core/diagnostic/beast_Error.h b/modules/beast_core/diagnostic/beast_Error.h index c5528dccbc..946270b758 100644 --- a/modules/beast_core/diagnostic/beast_Error.h +++ b/modules/beast_core/diagnostic/beast_Error.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ERROR_BEASTHEADER -#define BEAST_ERROR_BEASTHEADER +#ifndef BEAST_ERROR_H_INCLUDED +#define BEAST_ERROR_H_INCLUDED /** A concise error report. diff --git a/modules/beast_core/diagnostic/beast_FPUFlags.h b/modules/beast_core/diagnostic/beast_FPUFlags.h index b1c8d51d7f..73c17e56f0 100644 --- a/modules/beast_core/diagnostic/beast_FPUFlags.h +++ b/modules/beast_core/diagnostic/beast_FPUFlags.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FPUFLAGS_BEASTHEADER -#define BEAST_FPUFLAGS_BEASTHEADER +#ifndef BEAST_FPUFLAGS_H_INCLUDED +#define BEAST_FPUFLAGS_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/diagnostic/beast_SafeBool.h b/modules/beast_core/diagnostic/beast_SafeBool.h index 0c12a3ceb1..1b6dfad0e3 100644 --- a/modules/beast_core/diagnostic/beast_SafeBool.h +++ b/modules/beast_core/diagnostic/beast_SafeBool.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SAFEBOOL_BEASTHEADER -#define BEAST_SAFEBOOL_BEASTHEADER +#ifndef BEAST_SAFEBOOL_H_INCLUDED +#define BEAST_SAFEBOOL_H_INCLUDED /** Safe evaluation of class as `bool`. diff --git a/modules/beast_core/files/beast_DirectoryIterator.h b/modules/beast_core/files/beast_DirectoryIterator.h index 80a5bd6ff5..a1bdb42500 100644 --- a/modules/beast_core/files/beast_DirectoryIterator.h +++ b/modules/beast_core/files/beast_DirectoryIterator.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_DIRECTORYITERATOR_BEASTHEADER -#define BEAST_DIRECTORYITERATOR_BEASTHEADER +#ifndef BEAST_DIRECTORYITERATOR_H_INCLUDED +#define BEAST_DIRECTORYITERATOR_H_INCLUDED #include "beast_File.h" #include "../memory/beast_ScopedPointer.h" @@ -147,4 +147,4 @@ private: File currentFile; }; -#endif // BEAST_DIRECTORYITERATOR_BEASTHEADER +#endif // BEAST_DIRECTORYITERATOR_H_INCLUDED diff --git a/modules/beast_core/files/beast_File.h b/modules/beast_core/files/beast_File.h index 22f32b9320..cfd724f023 100644 --- a/modules/beast_core/files/beast_File.h +++ b/modules/beast_core/files/beast_File.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILE_BEASTHEADER -#define BEAST_FILE_BEASTHEADER +#ifndef BEAST_FILE_H_INCLUDED +#define BEAST_FILE_H_INCLUDED #include "../containers/beast_Array.h" #include "../time/beast_Time.h" @@ -951,4 +951,4 @@ private: bool setFileReadOnlyInternal (bool) const; }; -#endif // BEAST_FILE_BEASTHEADER +#endif // BEAST_FILE_H_INCLUDED diff --git a/modules/beast_core/files/beast_FileInputStream.h b/modules/beast_core/files/beast_FileInputStream.h index 1e1d94fecf..883e74b909 100644 --- a/modules/beast_core/files/beast_FileInputStream.h +++ b/modules/beast_core/files/beast_FileInputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILEINPUTSTREAM_BEASTHEADER -#define BEAST_FILEINPUTSTREAM_BEASTHEADER +#ifndef BEAST_FILEINPUTSTREAM_H_INCLUDED +#define BEAST_FILEINPUTSTREAM_H_INCLUDED #include "beast_File.h" #include "../streams/beast_InputStream.h" @@ -91,4 +91,4 @@ private: size_t readInternal (void* buffer, size_t numBytes); }; -#endif // BEAST_FILEINPUTSTREAM_BEASTHEADER +#endif // BEAST_FILEINPUTSTREAM_H_INCLUDED diff --git a/modules/beast_core/files/beast_FileOutputStream.h b/modules/beast_core/files/beast_FileOutputStream.h index 0cc8eaa7de..26c05c1486 100644 --- a/modules/beast_core/files/beast_FileOutputStream.h +++ b/modules/beast_core/files/beast_FileOutputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILEOUTPUTSTREAM_BEASTHEADER -#define BEAST_FILEOUTPUTSTREAM_BEASTHEADER +#ifndef BEAST_FILEOUTPUTSTREAM_H_INCLUDED +#define BEAST_FILEOUTPUTSTREAM_H_INCLUDED #include "beast_File.h" #include "../streams/beast_OutputStream.h" diff --git a/modules/beast_core/files/beast_FileSearchPath.h b/modules/beast_core/files/beast_FileSearchPath.h index bb6906af36..9c88f4729d 100644 --- a/modules/beast_core/files/beast_FileSearchPath.h +++ b/modules/beast_core/files/beast_FileSearchPath.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILESEARCHPATH_BEASTHEADER -#define BEAST_FILESEARCHPATH_BEASTHEADER +#ifndef BEAST_FILESEARCHPATH_H_INCLUDED +#define BEAST_FILESEARCHPATH_H_INCLUDED #include "beast_File.h" #include "../text/beast_StringArray.h" @@ -159,4 +159,4 @@ private: void init (const String& path); }; -#endif // BEAST_FILESEARCHPATH_BEASTHEADER +#endif // BEAST_FILESEARCHPATH_H_INCLUDED diff --git a/modules/beast_core/files/beast_MemoryMappedFile.h b/modules/beast_core/files/beast_MemoryMappedFile.h index 98b3f6192c..5c5659a0c0 100644 --- a/modules/beast_core/files/beast_MemoryMappedFile.h +++ b/modules/beast_core/files/beast_MemoryMappedFile.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYMAPPEDFILE_BEASTHEADER -#define BEAST_MEMORYMAPPEDFILE_BEASTHEADER +#ifndef BEAST_MEMORYMAPPEDFILE_H_INCLUDED +#define BEAST_MEMORYMAPPEDFILE_H_INCLUDED #include "beast_File.h" @@ -106,4 +106,4 @@ private: }; -#endif // BEAST_MEMORYMAPPEDFILE_BEASTHEADER +#endif // BEAST_MEMORYMAPPEDFILE_H_INCLUDED diff --git a/modules/beast_core/files/beast_TemporaryFile.h b/modules/beast_core/files/beast_TemporaryFile.h index 62e8dd2307..52354c7fa2 100644 --- a/modules/beast_core/files/beast_TemporaryFile.h +++ b/modules/beast_core/files/beast_TemporaryFile.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TEMPORARYFILE_BEASTHEADER -#define BEAST_TEMPORARYFILE_BEASTHEADER +#ifndef BEAST_TEMPORARYFILE_H_INCLUDED +#define BEAST_TEMPORARYFILE_H_INCLUDED #include "beast_File.h" @@ -161,4 +161,4 @@ private: const File temporaryFile, targetFile; }; -#endif // BEAST_TEMPORARYFILE_BEASTHEADER +#endif // BEAST_TEMPORARYFILE_H_INCLUDED diff --git a/modules/beast_core/functional/beast_Function.h b/modules/beast_core/functional/beast_Function.h index 20c72df5c4..bf3653d994 100644 --- a/modules/beast_core/functional/beast_Function.h +++ b/modules/beast_core/functional/beast_Function.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FUNCTION_BEASTHEADER -#define BEAST_FUNCTION_BEASTHEADER +#ifndef BEAST_FUNCTION_H_INCLUDED +#define BEAST_FUNCTION_H_INCLUDED // // Strong replacement for boost::function: diff --git a/modules/beast_core/json/beast_JSON.h b/modules/beast_core/json/beast_JSON.h index f1799d434a..ab2c74efd7 100644 --- a/modules/beast_core/json/beast_JSON.h +++ b/modules/beast_core/json/beast_JSON.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_JSON_BEASTHEADER -#define BEAST_JSON_BEASTHEADER +#ifndef BEAST_JSON_H_INCLUDED +#define BEAST_JSON_H_INCLUDED #include "../misc/beast_Result.h" #include "../containers/beast_Variant.h" @@ -110,4 +110,4 @@ private: }; -#endif // BEAST_JSON_BEASTHEADER +#endif // BEAST_JSON_H_INCLUDED diff --git a/modules/beast_core/logging/beast_FileLogger.h b/modules/beast_core/logging/beast_FileLogger.h index 5647799672..396d78c747 100644 --- a/modules/beast_core/logging/beast_FileLogger.h +++ b/modules/beast_core/logging/beast_FileLogger.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILELOGGER_BEASTHEADER -#define BEAST_FILELOGGER_BEASTHEADER +#ifndef BEAST_FILELOGGER_H_INCLUDED +#define BEAST_FILELOGGER_H_INCLUDED #include "beast_Logger.h" #include "../files/beast_File.h" @@ -132,4 +132,4 @@ private: }; -#endif // BEAST_FILELOGGER_BEASTHEADER +#endif // BEAST_FILELOGGER_H_INCLUDED diff --git a/modules/beast_core/logging/beast_Logger.h b/modules/beast_core/logging/beast_Logger.h index 203ea209b3..0b687d2c4c 100644 --- a/modules/beast_core/logging/beast_Logger.h +++ b/modules/beast_core/logging/beast_Logger.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_LOGGER_BEASTHEADER -#define BEAST_LOGGER_BEASTHEADER +#ifndef BEAST_LOGGER_H_INCLUDED +#define BEAST_LOGGER_H_INCLUDED #include "../text/beast_String.h" @@ -91,4 +91,4 @@ private: }; -#endif // BEAST_LOGGER_BEASTHEADER +#endif // BEAST_LOGGER_H_INCLUDED diff --git a/modules/beast_core/maths/beast_BigInteger.h b/modules/beast_core/maths/beast_BigInteger.h index 90e47728fc..cd886a29f4 100644 --- a/modules/beast_core/maths/beast_BigInteger.h +++ b/modules/beast_core/maths/beast_BigInteger.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_BIGINTEGER_BEASTHEADER -#define BEAST_BIGINTEGER_BEASTHEADER +#ifndef BEAST_BIGINTEGER_H_INCLUDED +#define BEAST_BIGINTEGER_H_INCLUDED #include "../text/beast_String.h" #include "../memory/beast_HeapBlock.h" @@ -324,4 +324,4 @@ OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const BigInteger& #endif -#endif // BEAST_BIGINTEGER_BEASTHEADER +#endif // BEAST_BIGINTEGER_H_INCLUDED diff --git a/modules/beast_core/maths/beast_Expression.h b/modules/beast_core/maths/beast_Expression.h index 0d1456b301..8f4b548bd1 100644 --- a/modules/beast_core/maths/beast_Expression.h +++ b/modules/beast_core/maths/beast_Expression.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_EXPRESSION_BEASTHEADER -#define BEAST_EXPRESSION_BEASTHEADER +#ifndef BEAST_EXPRESSION_H_INCLUDED +#define BEAST_EXPRESSION_H_INCLUDED #include "../memory/beast_SharedObject.h" #include "../containers/beast_Array.h" @@ -266,4 +266,4 @@ private: explicit Expression (Term*); }; -#endif // BEAST_EXPRESSION_BEASTHEADER +#endif // BEAST_EXPRESSION_H_INCLUDED diff --git a/modules/beast_core/maths/beast_Interval.h b/modules/beast_core/maths/beast_Interval.h index 411496d5d8..833af4551e 100644 --- a/modules/beast_core/maths/beast_Interval.h +++ b/modules/beast_core/maths/beast_Interval.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_INTERVAL_BEASTHEADER -#define BEAST_INTERVAL_BEASTHEADER +#ifndef BEAST_INTERVAL_H_INCLUDED +#define BEAST_INTERVAL_H_INCLUDED /** A half-open interval. diff --git a/modules/beast_core/maths/beast_Math.h b/modules/beast_core/maths/beast_Math.h index e042af7a88..b3976656f0 100644 --- a/modules/beast_core/maths/beast_Math.h +++ b/modules/beast_core/maths/beast_Math.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_MATH_BEASTHEADER -#define BEAST_MATH_BEASTHEADER +#ifndef BEAST_MATH_H_INCLUDED +#define BEAST_MATH_H_INCLUDED // // Miscellaneous mathematical calculations diff --git a/modules/beast_core/maths/beast_MathsFunctions.h b/modules/beast_core/maths/beast_MathsFunctions.h index f4b7e288b4..6532951c4b 100644 --- a/modules/beast_core/maths/beast_MathsFunctions.h +++ b/modules/beast_core/maths/beast_MathsFunctions.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MATHSFUNCTIONS_BEASTHEADER -#define BEAST_MATHSFUNCTIONS_BEASTHEADER +#ifndef BEAST_MATHSFUNCTIONS_H_INCLUDED +#define BEAST_MATHSFUNCTIONS_H_INCLUDED //============================================================================== /* @@ -512,4 +512,4 @@ namespace TypeHelpers //============================================================================== -#endif // BEAST_MATHSFUNCTIONS_BEASTHEADER +#endif // BEAST_MATHSFUNCTIONS_H_INCLUDED diff --git a/modules/beast_core/maths/beast_MurmurHash.h b/modules/beast_core/maths/beast_MurmurHash.h index 0f1e8c2385..9ed0b0c582 100644 --- a/modules/beast_core/maths/beast_MurmurHash.h +++ b/modules/beast_core/maths/beast_MurmurHash.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_MURMURHASH_BEASTHEADER -#define BEAST_MURMURHASH_BEASTHEADER +#ifndef BEAST_MURMURHASH_H_INCLUDED +#define BEAST_MURMURHASH_H_INCLUDED // Original source code links in .cpp file diff --git a/modules/beast_core/maths/beast_Random.h b/modules/beast_core/maths/beast_Random.h index 26d77c8a9b..bcce19d161 100644 --- a/modules/beast_core/maths/beast_Random.h +++ b/modules/beast_core/maths/beast_Random.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RANDOM_BEASTHEADER -#define BEAST_RANDOM_BEASTHEADER +#ifndef BEAST_RANDOM_H_INCLUDED +#define BEAST_RANDOM_H_INCLUDED #include "beast_BigInteger.h" @@ -133,4 +133,4 @@ private: }; -#endif // BEAST_RANDOM_BEASTHEADER +#endif // BEAST_RANDOM_H_INCLUDED diff --git a/modules/beast_core/maths/beast_Range.h b/modules/beast_core/maths/beast_Range.h index dc3a1f2179..48ccf87b4c 100644 --- a/modules/beast_core/maths/beast_Range.h +++ b/modules/beast_core/maths/beast_Range.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RANGE_BEASTHEADER -#define BEAST_RANGE_BEASTHEADER +#ifndef BEAST_RANGE_H_INCLUDED +#define BEAST_RANGE_H_INCLUDED //============================================================================== @@ -256,4 +256,4 @@ private: }; -#endif // BEAST_RANGE_BEASTHEADER +#endif // BEAST_RANGE_H_INCLUDED diff --git a/modules/beast_core/memory/beast_AllocatedBy.h b/modules/beast_core/memory/beast_AllocatedBy.h index 502914c76a..c790b6f587 100644 --- a/modules/beast_core/memory/beast_AllocatedBy.h +++ b/modules/beast_core/memory/beast_AllocatedBy.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ALLOCATEDBY_BEASTHEADER -#define BEAST_ALLOCATEDBY_BEASTHEADER +#ifndef BEAST_ALLOCATEDBY_H_INCLUDED +#define BEAST_ALLOCATEDBY_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_Atomic.h b/modules/beast_core/memory/beast_Atomic.h index 74ba13c135..9fcc92fcfa 100644 --- a/modules/beast_core/memory/beast_Atomic.h +++ b/modules/beast_core/memory/beast_Atomic.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ATOMIC_BEASTHEADER -#define BEAST_ATOMIC_BEASTHEADER +#ifndef BEAST_ATOMIC_H_INCLUDED +#define BEAST_ATOMIC_H_INCLUDED //============================================================================== @@ -389,4 +389,4 @@ inline void Atomic::memoryBarrier() noexcept #pragma warning (pop) #endif -#endif // BEAST_ATOMIC_BEASTHEADER +#endif // BEAST_ATOMIC_H_INCLUDED diff --git a/modules/beast_core/memory/beast_AtomicCounter.h b/modules/beast_core/memory/beast_AtomicCounter.h index 978dd5a855..0f03456cb8 100644 --- a/modules/beast_core/memory/beast_AtomicCounter.h +++ b/modules/beast_core/memory/beast_AtomicCounter.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ATOMICCOUNTER_BEASTHEADER -#define BEAST_ATOMICCOUNTER_BEASTHEADER +#ifndef BEAST_ATOMICCOUNTER_H_INCLUDED +#define BEAST_ATOMICCOUNTER_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_AtomicFlag.h b/modules/beast_core/memory/beast_AtomicFlag.h index e7d605bf63..6613ca123f 100644 --- a/modules/beast_core/memory/beast_AtomicFlag.h +++ b/modules/beast_core/memory/beast_AtomicFlag.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ATOMICFLAG_BEASTHEADER -#define BEAST_ATOMICFLAG_BEASTHEADER +#ifndef BEAST_ATOMICFLAG_H_INCLUDED +#define BEAST_ATOMICFLAG_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_AtomicPointer.h b/modules/beast_core/memory/beast_AtomicPointer.h index df144d866c..28ae3a0de9 100644 --- a/modules/beast_core/memory/beast_AtomicPointer.h +++ b/modules/beast_core/memory/beast_AtomicPointer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ATOMICPOINTER_BEASTHEADER -#define BEAST_ATOMICPOINTER_BEASTHEADER +#ifndef BEAST_ATOMICPOINTER_H_INCLUDED +#define BEAST_ATOMICPOINTER_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_AtomicState.h b/modules/beast_core/memory/beast_AtomicState.h index a3224c935f..ec65aaada5 100644 --- a/modules/beast_core/memory/beast_AtomicState.h +++ b/modules/beast_core/memory/beast_AtomicState.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ATOMICSTATE_BEASTHEADER -#define BEAST_ATOMICSTATE_BEASTHEADER +#ifndef BEAST_ATOMICSTATE_H_INCLUDED +#define BEAST_ATOMICSTATE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_CacheLine.h b/modules/beast_core/memory/beast_CacheLine.h index ef7b476bbd..dea39ebbb4 100644 --- a/modules/beast_core/memory/beast_CacheLine.h +++ b/modules/beast_core/memory/beast_CacheLine.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CACHELINE_BEASTHEADER -#define BEAST_CACHELINE_BEASTHEADER +#ifndef BEAST_CACHELINE_H_INCLUDED +#define BEAST_CACHELINE_H_INCLUDED // Allows turning off of all padding, // e.g. for memory-constrained systems or testing. diff --git a/modules/beast_core/memory/beast_FifoFreeStore.h b/modules/beast_core/memory/beast_FifoFreeStore.h index 058a986349..698e3f24e1 100644 --- a/modules/beast_core/memory/beast_FifoFreeStore.h +++ b/modules/beast_core/memory/beast_FifoFreeStore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FIFOFREESTORE_BEASTHEADER -#define BEAST_FIFOFREESTORE_BEASTHEADER +#ifndef BEAST_FIFOFREESTORE_H_INCLUDED +#define BEAST_FIFOFREESTORE_H_INCLUDED /** Selected free store based on compilation settings. diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h index 4ecbe90b70..32ca322d3c 100644 --- a/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h +++ b/modules/beast_core/memory/beast_FifoFreeStoreWithTLS.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FIFOFREESTOREWITHTLS_BEASTHEADER -#define BEAST_FIFOFREESTOREWITHTLS_BEASTHEADER +#ifndef BEAST_FIFOFREESTOREWITHTLS_H_INCLUDED +#define BEAST_FIFOFREESTOREWITHTLS_H_INCLUDED #if BEAST_BOOST_IS_AVAILABLE diff --git a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h index 4b666a39cb..85a4334cfc 100644 --- a/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h +++ b/modules/beast_core/memory/beast_FifoFreeStoreWithoutTLS.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_FIFOFREESTOREWITHOUTTLS_BEASTHEADER -#define BEAST_FIFOFREESTOREWITHOUTTLS_BEASTHEADER +#ifndef BEAST_FIFOFREESTOREWITHOUTTLS_H_INCLUDED +#define BEAST_FIFOFREESTOREWITHOUTTLS_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_GlobalFifoFreeStore.h b/modules/beast_core/memory/beast_GlobalFifoFreeStore.h index bdeff7ce6f..1c43cc15e7 100644 --- a/modules/beast_core/memory/beast_GlobalFifoFreeStore.h +++ b/modules/beast_core/memory/beast_GlobalFifoFreeStore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_GLOBALFIFOFREESTORE_BEASTHEADER -#define BEAST_GLOBALFIFOFREESTORE_BEASTHEADER +#ifndef BEAST_GLOBALFIFOFREESTORE_H_INCLUDED +#define BEAST_GLOBALFIFOFREESTORE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_GlobalPagedFreeStore.h b/modules/beast_core/memory/beast_GlobalPagedFreeStore.h index aa52d65066..5e2d4e3ca4 100644 --- a/modules/beast_core/memory/beast_GlobalPagedFreeStore.h +++ b/modules/beast_core/memory/beast_GlobalPagedFreeStore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_GLOBALPAGEDFREESTORE_BEASTHEADER -#define BEAST_GLOBALPAGEDFREESTORE_BEASTHEADER +#ifndef BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED +#define BEAST_GLOBALPAGEDFREESTORE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_HeapBlock.h b/modules/beast_core/memory/beast_HeapBlock.h index dfedcca935..935e1e0172 100644 --- a/modules/beast_core/memory/beast_HeapBlock.h +++ b/modules/beast_core/memory/beast_HeapBlock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_HEAPBLOCK_BEASTHEADER -#define BEAST_HEAPBLOCK_BEASTHEADER +#ifndef BEAST_HEAPBLOCK_H_INCLUDED +#define BEAST_HEAPBLOCK_H_INCLUDED #ifndef DOXYGEN namespace HeapBlockHelper @@ -299,4 +299,4 @@ private: }; -#endif // BEAST_HEAPBLOCK_BEASTHEADER +#endif // BEAST_HEAPBLOCK_H_INCLUDED diff --git a/modules/beast_core/memory/beast_Memory.h b/modules/beast_core/memory/beast_Memory.h index cf87978c5c..b67ec0cd7a 100644 --- a/modules/beast_core/memory/beast_Memory.h +++ b/modules/beast_core/memory/beast_Memory.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORY_BEASTHEADER -#define BEAST_MEMORY_BEASTHEADER +#ifndef BEAST_MEMORY_H_INCLUDED +#define BEAST_MEMORY_H_INCLUDED //============================================================================== /** Fills a block of memory with zeros. */ diff --git a/modules/beast_core/memory/beast_MemoryAlignment.h b/modules/beast_core/memory/beast_MemoryAlignment.h index 0b2e50a5ba..0ff5dad1c4 100644 --- a/modules/beast_core/memory/beast_MemoryAlignment.h +++ b/modules/beast_core/memory/beast_MemoryAlignment.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYALIGNMENT_BEASTHEADER -#define BEAST_MEMORYALIGNMENT_BEASTHEADER +#ifndef BEAST_MEMORYALIGNMENT_H_INCLUDED +#define BEAST_MEMORYALIGNMENT_H_INCLUDED namespace Memory { diff --git a/modules/beast_core/memory/beast_MemoryBlock.h b/modules/beast_core/memory/beast_MemoryBlock.h index e04f65e104..44ed81932c 100644 --- a/modules/beast_core/memory/beast_MemoryBlock.h +++ b/modules/beast_core/memory/beast_MemoryBlock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYBLOCK_BEASTHEADER -#define BEAST_MEMORYBLOCK_BEASTHEADER +#ifndef BEAST_MEMORYBLOCK_H_INCLUDED +#define BEAST_MEMORYBLOCK_H_INCLUDED #include "../text/beast_String.h" #include "../memory/beast_HeapBlock.h" @@ -270,4 +270,4 @@ private: }; -#endif // BEAST_MEMORYBLOCK_BEASTHEADER +#endif // BEAST_MEMORYBLOCK_H_INCLUDED diff --git a/modules/beast_core/memory/beast_OptionalScopedPointer.h b/modules/beast_core/memory/beast_OptionalScopedPointer.h index eb9b45d495..f005403fdd 100644 --- a/modules/beast_core/memory/beast_OptionalScopedPointer.h +++ b/modules/beast_core/memory/beast_OptionalScopedPointer.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OPTIONALSCOPEDPOINTER_BEASTHEADER -#define BEAST_OPTIONALSCOPEDPOINTER_BEASTHEADER +#ifndef BEAST_OPTIONALSCOPEDPOINTER_H_INCLUDED +#define BEAST_OPTIONALSCOPEDPOINTER_H_INCLUDED #include "beast_ScopedPointer.h" @@ -180,4 +180,4 @@ private: }; -#endif // BEAST_OPTIONALSCOPEDPOINTER_BEASTHEADER +#endif // BEAST_OPTIONALSCOPEDPOINTER_H_INCLUDED diff --git a/modules/beast_core/memory/beast_PagedFreeStore.h b/modules/beast_core/memory/beast_PagedFreeStore.h index 14b647cfe5..ebe923fd02 100644 --- a/modules/beast_core/memory/beast_PagedFreeStore.h +++ b/modules/beast_core/memory/beast_PagedFreeStore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_PAGEDFREESTORE_BEASTHEADER -#define BEAST_PAGEDFREESTORE_BEASTHEADER +#ifndef BEAST_PAGEDFREESTORE_H_INCLUDED +#define BEAST_PAGEDFREESTORE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/memory/beast_ScopedPointer.h b/modules/beast_core/memory/beast_ScopedPointer.h index 60d1a2952a..09906874cb 100644 --- a/modules/beast_core/memory/beast_ScopedPointer.h +++ b/modules/beast_core/memory/beast_ScopedPointer.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDPOINTER_BEASTHEADER -#define BEAST_SCOPEDPOINTER_BEASTHEADER +#ifndef BEAST_SCOPEDPOINTER_H_INCLUDED +#define BEAST_SCOPEDPOINTER_H_INCLUDED //============================================================================== /** @@ -248,4 +248,4 @@ template void deleteAndZero (ScopedPointer&) { static_bassert (sizeof (Type) == 12345); } #endif -#endif // BEAST_SCOPEDPOINTER_BEASTHEADER +#endif // BEAST_SCOPEDPOINTER_H_INCLUDED diff --git a/modules/beast_core/memory/beast_SharedObject.h b/modules/beast_core/memory/beast_SharedObject.h index 7aec64ff81..65db29baba 100644 --- a/modules/beast_core/memory/beast_SharedObject.h +++ b/modules/beast_core/memory/beast_SharedObject.h @@ -24,8 +24,6 @@ #ifndef BEAST_SHAREDOBJECT_H_INCLUDED #define BEAST_SHAREDOBJECT_H_INCLUDED -#include "beast_Atomic.h" - //============================================================================== /** Adds reference-counting to an object. @@ -410,4 +408,4 @@ bool operator!= (Object* object1, SharedObjectPtr& object2) noexcept } -#endif // BEAST_REFERENCECOUNTEDOBJECT_BEASTHEADER +#endif // BEAST_REFERENCECOUNTEDOBJECT_H_INCLUDED diff --git a/modules/beast_core/memory/beast_SharedSingleton.h b/modules/beast_core/memory/beast_SharedSingleton.h index fc6ab0c265..15313807db 100644 --- a/modules/beast_core/memory/beast_SharedSingleton.h +++ b/modules/beast_core/memory/beast_SharedSingleton.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_REFERENCECOUNTEDSINGLETON_BEASTHEADER -#define BEAST_REFERENCECOUNTEDSINGLETON_BEASTHEADER +#ifndef BEAST_REFERENCECOUNTEDSINGLETON_H_INCLUDED +#define BEAST_REFERENCECOUNTEDSINGLETON_H_INCLUDED /** Thread-safe singleton which comes into existence on first use. Use this instead of creating objects with static storage duration. These singletons diff --git a/modules/beast_core/memory/beast_StaticObject.h b/modules/beast_core/memory/beast_StaticObject.h index d1533bee38..4019245a9f 100644 --- a/modules/beast_core/memory/beast_StaticObject.h +++ b/modules/beast_core/memory/beast_StaticObject.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_STATICOBJECT_BEASTHEADER -#define BEAST_STATICOBJECT_BEASTHEADER +#ifndef BEAST_STATICOBJECT_H_INCLUDED +#define BEAST_STATICOBJECT_H_INCLUDED // // A full suite of thread-safe objects designed for static storage duration. diff --git a/modules/beast_core/memory/beast_WeakReference.h b/modules/beast_core/memory/beast_WeakReference.h index c96022618c..7f969b9c8e 100644 --- a/modules/beast_core/memory/beast_WeakReference.h +++ b/modules/beast_core/memory/beast_WeakReference.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_WEAKREFERENCE_BEASTHEADER -#define BEAST_WEAKREFERENCE_BEASTHEADER +#ifndef BEAST_WEAKREFERENCE_H_INCLUDED +#define BEAST_WEAKREFERENCE_H_INCLUDED #include "beast_SharedObject.h" @@ -204,4 +204,4 @@ private: }; -#endif // BEAST_WEAKREFERENCE_BEASTHEADER +#endif // BEAST_WEAKREFERENCE_H_INCLUDED diff --git a/modules/beast_core/misc/beast_Result.h b/modules/beast_core/misc/beast_Result.h index 91bd1e1aee..901e99451f 100644 --- a/modules/beast_core/misc/beast_Result.h +++ b/modules/beast_core/misc/beast_Result.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RESULT_BEASTHEADER -#define BEAST_RESULT_BEASTHEADER +#ifndef BEAST_RESULT_H_INCLUDED +#define BEAST_RESULT_H_INCLUDED #include "../text/beast_String.h" diff --git a/modules/beast_core/misc/beast_Uuid.h b/modules/beast_core/misc/beast_Uuid.h index 358b8ce444..4590729071 100644 --- a/modules/beast_core/misc/beast_Uuid.h +++ b/modules/beast_core/misc/beast_Uuid.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_UUID_BEASTHEADER -#define BEAST_UUID_BEASTHEADER +#ifndef BEAST_UUID_H_INCLUDED +#define BEAST_UUID_H_INCLUDED #include "../text/beast_String.h" @@ -104,4 +104,4 @@ private: }; -#endif // BEAST_UUID_BEASTHEADER +#endif // BEAST_UUID_H_INCLUDED diff --git a/modules/beast_core/misc/beast_WindowsRegistry.h b/modules/beast_core/misc/beast_WindowsRegistry.h index 5a62729fed..9d89defd30 100644 --- a/modules/beast_core/misc/beast_WindowsRegistry.h +++ b/modules/beast_core/misc/beast_WindowsRegistry.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_WINDOWSREGISTRY_BEASTHEADER -#define BEAST_WINDOWSREGISTRY_BEASTHEADER +#ifndef BEAST_WINDOWSREGISTRY_H_INCLUDED +#define BEAST_WINDOWSREGISTRY_H_INCLUDED #if BEAST_WINDOWS || DOXYGEN @@ -115,4 +115,4 @@ private: }; #endif -#endif // BEAST_WINDOWSREGISTRY_BEASTHEADER +#endif // BEAST_WINDOWSREGISTRY_H_INCLUDED diff --git a/modules/beast_core/native/beast_BasicNativeHeaders.h b/modules/beast_core/native/beast_BasicNativeHeaders.h index 7a39aac765..4807629162 100644 --- a/modules/beast_core/native/beast_BasicNativeHeaders.h +++ b/modules/beast_core/native/beast_BasicNativeHeaders.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_BASICNATIVEHEADERS_BEASTHEADER -#define BEAST_BASICNATIVEHEADERS_BEASTHEADER +#ifndef BEAST_BASICNATIVEHEADERS_H_INCLUDED +#define BEAST_BASICNATIVEHEADERS_H_INCLUDED #include "../system/beast_TargetPlatform.h" #undef T @@ -235,4 +235,4 @@ #undef direct #undef check -#endif // BEAST_BASICNATIVEHEADERS_BEASTHEADER +#endif // BEAST_BASICNATIVEHEADERS_H_INCLUDED diff --git a/modules/beast_core/native/beast_android_JNIHelpers.h b/modules/beast_core/native/beast_android_JNIHelpers.h index 68cc75b643..6a4f1f9672 100644 --- a/modules/beast_core/native/beast_android_JNIHelpers.h +++ b/modules/beast_core/native/beast_android_JNIHelpers.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_ANDROID_JNIHELPERS_BEASTHEADER -#define BEAST_ANDROID_JNIHELPERS_BEASTHEADER +#ifndef BEAST_ANDROID_JNIHELPERS_H_INCLUDED +#define BEAST_ANDROID_JNIHELPERS_H_INCLUDED #if ! (defined (BEAST_ANDROID_ACTIVITY_CLASSNAME) && defined (BEAST_ANDROID_ACTIVITY_CLASSPATH)) #error "The BEAST_ANDROID_ACTIVITY_CLASSNAME and BEAST_ANDROID_ACTIVITY_CLASSPATH macros must be set!" @@ -397,4 +397,4 @@ DECLARE_JNI_CLASS (Matrix, "android/graphics/Matrix"); DECLARE_JNI_CLASS (RectClass, "android/graphics/Rect"); #undef JNI_CLASS_MEMBERS -#endif // BEAST_ANDROID_JNIHELPERS_BEASTHEADER +#endif // BEAST_ANDROID_JNIHELPERS_H_INCLUDED diff --git a/modules/beast_core/native/beast_osx_ObjCHelpers.h b/modules/beast_core/native/beast_osx_ObjCHelpers.h index f8cd9a679f..29f992296b 100644 --- a/modules/beast_core/native/beast_osx_ObjCHelpers.h +++ b/modules/beast_core/native/beast_osx_ObjCHelpers.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OSX_OBJCHELPERS_BEASTHEADER -#define BEAST_OSX_OBJCHELPERS_BEASTHEADER +#ifndef BEAST_OSX_OBJCHELPERS_H_INCLUDED +#define BEAST_OSX_OBJCHELPERS_H_INCLUDED /* This file contains a few helper functions that are used internally but which @@ -148,4 +148,4 @@ private: }; -#endif // BEAST_OSX_OBJCHELPERS_BEASTHEADER +#endif // BEAST_OSX_OBJCHELPERS_H_INCLUDED diff --git a/modules/beast_core/native/beast_win32_ComSmartPtr.h b/modules/beast_core/native/beast_win32_ComSmartPtr.h index 88b46dc05f..03c9380acd 100644 --- a/modules/beast_core/native/beast_win32_ComSmartPtr.h +++ b/modules/beast_core/native/beast_win32_ComSmartPtr.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_WIN32_COMSMARTPTR_BEASTHEADER -#define BEAST_WIN32_COMSMARTPTR_BEASTHEADER +#ifndef BEAST_WIN32_COMSMARTPTR_H_INCLUDED +#define BEAST_WIN32_COMSMARTPTR_H_INCLUDED #ifndef _MSC_VER template struct UUIDGetter { static CLSID get() { bassertfalse; return CLSID(); } }; @@ -162,4 +162,4 @@ public: } }; -#endif // BEAST_WIN32_COMSMARTPTR_BEASTHEADER +#endif // BEAST_WIN32_COMSMARTPTR_H_INCLUDED diff --git a/modules/beast_core/network/beast_IPAddress.h b/modules/beast_core/network/beast_IPAddress.h index 9232365d33..6847d7aefe 100644 --- a/modules/beast_core/network/beast_IPAddress.h +++ b/modules/beast_core/network/beast_IPAddress.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_IPADDRESS_BEASTHEADER -#define BEAST_IPADDRESS_BEASTHEADER +#ifndef BEAST_IPADDRESS_H_INCLUDED +#define BEAST_IPADDRESS_H_INCLUDED //============================================================================== @@ -74,4 +74,4 @@ public: }; -#endif // BEAST_IPADDRESS_BEASTHEADER +#endif // BEAST_IPADDRESS_H_INCLUDED diff --git a/modules/beast_core/network/beast_MACAddress.h b/modules/beast_core/network/beast_MACAddress.h index 6f9fb945f2..175f10845f 100644 --- a/modules/beast_core/network/beast_MACAddress.h +++ b/modules/beast_core/network/beast_MACAddress.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MACADDRESS_BEASTHEADER -#define BEAST_MACADDRESS_BEASTHEADER +#ifndef BEAST_MACADDRESS_H_INCLUDED +#define BEAST_MACADDRESS_H_INCLUDED #include "../containers/beast_Array.h" @@ -81,4 +81,4 @@ private: }; -#endif // BEAST_MACADDRESS_BEASTHEADER +#endif // BEAST_MACADDRESS_H_INCLUDED diff --git a/modules/beast_core/network/beast_NamedPipe.h b/modules/beast_core/network/beast_NamedPipe.h index d1e04f1dc5..2db30c294b 100644 --- a/modules/beast_core/network/beast_NamedPipe.h +++ b/modules/beast_core/network/beast_NamedPipe.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_NAMEDPIPE_BEASTHEADER -#define BEAST_NAMEDPIPE_BEASTHEADER +#ifndef BEAST_NAMEDPIPE_H_INCLUDED +#define BEAST_NAMEDPIPE_H_INCLUDED #include "../threads/beast_ReadWriteLock.h" @@ -95,4 +95,4 @@ private: }; -#endif // BEAST_NAMEDPIPE_BEASTHEADER +#endif // BEAST_NAMEDPIPE_H_INCLUDED diff --git a/modules/beast_core/network/beast_Socket.h b/modules/beast_core/network/beast_Socket.h index 36e5e70f1e..4e8910e51e 100644 --- a/modules/beast_core/network/beast_Socket.h +++ b/modules/beast_core/network/beast_Socket.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SOCKET_BEASTHEADER -#define BEAST_SOCKET_BEASTHEADER +#ifndef BEAST_SOCKET_H_INCLUDED +#define BEAST_SOCKET_H_INCLUDED #include "../text/beast_String.h" @@ -295,4 +295,4 @@ private: }; -#endif // BEAST_SOCKET_BEASTHEADER +#endif // BEAST_SOCKET_H_INCLUDED diff --git a/modules/beast_core/network/beast_URL.h b/modules/beast_core/network/beast_URL.h index 31e14afe17..6ddad168c3 100644 --- a/modules/beast_core/network/beast_URL.h +++ b/modules/beast_core/network/beast_URL.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_URL_BEASTHEADER -#define BEAST_URL_BEASTHEADER +#ifndef BEAST_URL_H_INCLUDED +#define BEAST_URL_H_INCLUDED #include "../text/beast_StringPairArray.h" #include "../files/beast_File.h" @@ -341,4 +341,4 @@ private: }; -#endif // BEAST_URL_BEASTHEADER +#endif // BEAST_URL_H_INCLUDED diff --git a/modules/beast_core/streams/beast_BufferedInputStream.h b/modules/beast_core/streams/beast_BufferedInputStream.h index c2d35440ea..2d3532b871 100644 --- a/modules/beast_core/streams/beast_BufferedInputStream.h +++ b/modules/beast_core/streams/beast_BufferedInputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_BUFFEREDINPUTSTREAM_BEASTHEADER -#define BEAST_BUFFEREDINPUTSTREAM_BEASTHEADER +#ifndef BEAST_BUFFEREDINPUTSTREAM_H_INCLUDED +#define BEAST_BUFFEREDINPUTSTREAM_H_INCLUDED #include "beast_InputStream.h" #include "../memory/beast_OptionalScopedPointer.h" @@ -88,4 +88,4 @@ private: void ensureBuffered(); }; -#endif // BEAST_BUFFEREDINPUTSTREAM_BEASTHEADER +#endif // BEAST_BUFFEREDINPUTSTREAM_H_INCLUDED diff --git a/modules/beast_core/streams/beast_FileInputSource.h b/modules/beast_core/streams/beast_FileInputSource.h index 9aa93275c3..99285d6824 100644 --- a/modules/beast_core/streams/beast_FileInputSource.h +++ b/modules/beast_core/streams/beast_FileInputSource.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_FILEINPUTSOURCE_BEASTHEADER -#define BEAST_FILEINPUTSOURCE_BEASTHEADER +#ifndef BEAST_FILEINPUTSOURCE_H_INCLUDED +#define BEAST_FILEINPUTSOURCE_H_INCLUDED #include "beast_InputSource.h" #include "../files/beast_File.h" @@ -62,4 +62,4 @@ private: }; -#endif // BEAST_FILEINPUTSOURCE_BEASTHEADER +#endif // BEAST_FILEINPUTSOURCE_H_INCLUDED diff --git a/modules/beast_core/streams/beast_InputSource.h b/modules/beast_core/streams/beast_InputSource.h index 1936df3a61..9fdb1c3c9b 100644 --- a/modules/beast_core/streams/beast_InputSource.h +++ b/modules/beast_core/streams/beast_InputSource.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_INPUTSOURCE_BEASTHEADER -#define BEAST_INPUTSOURCE_BEASTHEADER +#ifndef BEAST_INPUTSOURCE_H_INCLUDED +#define BEAST_INPUTSOURCE_H_INCLUDED #include "beast_InputStream.h" @@ -66,4 +66,4 @@ public: }; -#endif // BEAST_INPUTSOURCE_BEASTHEADER +#endif // BEAST_INPUTSOURCE_H_INCLUDED diff --git a/modules/beast_core/streams/beast_InputStream.h b/modules/beast_core/streams/beast_InputStream.h index 2b911bf180..fb779968d4 100644 --- a/modules/beast_core/streams/beast_InputStream.h +++ b/modules/beast_core/streams/beast_InputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_INPUTSTREAM_BEASTHEADER -#define BEAST_INPUTSTREAM_BEASTHEADER +#ifndef BEAST_INPUTSTREAM_H_INCLUDED +#define BEAST_INPUTSTREAM_H_INCLUDED #include "../text/beast_String.h" class MemoryBlock; diff --git a/modules/beast_core/streams/beast_MemoryInputStream.h b/modules/beast_core/streams/beast_MemoryInputStream.h index 038feab6e9..c59773cdaa 100644 --- a/modules/beast_core/streams/beast_MemoryInputStream.h +++ b/modules/beast_core/streams/beast_MemoryInputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYINPUTSTREAM_BEASTHEADER -#define BEAST_MEMORYINPUTSTREAM_BEASTHEADER +#ifndef BEAST_MEMORYINPUTSTREAM_H_INCLUDED +#define BEAST_MEMORYINPUTSTREAM_H_INCLUDED #include "beast_InputStream.h" #include "../memory/beast_HeapBlock.h" @@ -92,4 +92,4 @@ private: void createInternalCopy(); }; -#endif // BEAST_MEMORYINPUTSTREAM_BEASTHEADER +#endif // BEAST_MEMORYINPUTSTREAM_H_INCLUDED diff --git a/modules/beast_core/streams/beast_MemoryOutputStream.h b/modules/beast_core/streams/beast_MemoryOutputStream.h index be5fd04f28..5072517233 100644 --- a/modules/beast_core/streams/beast_MemoryOutputStream.h +++ b/modules/beast_core/streams/beast_MemoryOutputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_MEMORYOUTPUTSTREAM_BEASTHEADER -#define BEAST_MEMORYOUTPUTSTREAM_BEASTHEADER +#ifndef BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED +#define BEAST_MEMORYOUTPUTSTREAM_H_INCLUDED #include "beast_OutputStream.h" #include "../memory/beast_MemoryBlock.h" diff --git a/modules/beast_core/streams/beast_OutputStream.h b/modules/beast_core/streams/beast_OutputStream.h index b536c48a57..37024c3d0c 100644 --- a/modules/beast_core/streams/beast_OutputStream.h +++ b/modules/beast_core/streams/beast_OutputStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_OUTPUTSTREAM_BEASTHEADER -#define BEAST_OUTPUTSTREAM_BEASTHEADER +#ifndef BEAST_OUTPUTSTREAM_H_INCLUDED +#define BEAST_OUTPUTSTREAM_H_INCLUDED #include "../text/beast_String.h" #include "../text/beast_NewLine.h" diff --git a/modules/beast_core/streams/beast_SubregionStream.h b/modules/beast_core/streams/beast_SubregionStream.h index cc01fed0a3..e42ff00555 100644 --- a/modules/beast_core/streams/beast_SubregionStream.h +++ b/modules/beast_core/streams/beast_SubregionStream.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SUBREGIONSTREAM_BEASTHEADER -#define BEAST_SUBREGIONSTREAM_BEASTHEADER +#ifndef BEAST_SUBREGIONSTREAM_H_INCLUDED +#define BEAST_SUBREGIONSTREAM_H_INCLUDED #include "beast_InputStream.h" #include "../memory/beast_OptionalScopedPointer.h" @@ -84,4 +84,4 @@ private: const int64 startPositionInSourceStream, lengthOfSourceStream; }; -#endif // BEAST_SUBREGIONSTREAM_BEASTHEADER +#endif // BEAST_SUBREGIONSTREAM_H_INCLUDED diff --git a/modules/beast_core/system/beast_PlatformDefs.h b/modules/beast_core/system/beast_PlatformDefs.h index 9af6796ec4..619c219577 100644 --- a/modules/beast_core/system/beast_PlatformDefs.h +++ b/modules/beast_core/system/beast_PlatformDefs.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_PLATFORMDEFS_BEASTHEADER -#define BEAST_PLATFORMDEFS_BEASTHEADER +#ifndef BEAST_PLATFORMDEFS_H_INCLUDED +#define BEAST_PLATFORMDEFS_H_INCLUDED // This file defines miscellaneous macros for debugging, assertions, etc. diff --git a/modules/beast_core/system/beast_StandardHeader.h b/modules/beast_core/system/beast_StandardHeader.h index 96b9b60de9..473d228970 100644 --- a/modules/beast_core/system/beast_StandardHeader.h +++ b/modules/beast_core/system/beast_StandardHeader.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STANDARDHEADER_BEASTHEADER -#define BEAST_STANDARDHEADER_BEASTHEADER +#ifndef BEAST_STANDARDHEADER_H_INCLUDED +#define BEAST_STANDARDHEADER_H_INCLUDED //------------------------------------------------------------------------------ @@ -47,7 +47,6 @@ //------------------------------------------------------------------------------ -#include "beast_TargetPlatform.h" // (sets up the various BEAST_WINDOWS, BEAST_MAC, etc flags) #include "beast_PlatformDefs.h" // Now we'll include some common OS headers.. @@ -171,16 +170,4 @@ /** This macro is added to all beast public function declarations. */ #define BEAST_PUBLIC_FUNCTION BEAST_API BEAST_CALLTYPE -//------------------------------------------------------------------------------ - -namespace beast -{ - -extern BEAST_API bool BEAST_CALLTYPE beast_isRunningUnderDebugger(); -extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) noexcept; - -// These are so common that we include them early -// ? -} - #endif diff --git a/modules/beast_core/system/beast_SystemStats.h b/modules/beast_core/system/beast_SystemStats.h index a8f7920f56..05c447aac3 100644 --- a/modules/beast_core/system/beast_SystemStats.h +++ b/modules/beast_core/system/beast_SystemStats.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SYSTEMSTATS_BEASTHEADER -#define BEAST_SYSTEMSTATS_BEASTHEADER +#ifndef BEAST_SYSTEMSTATS_H_INCLUDED +#define BEAST_SYSTEMSTATS_H_INCLUDED //============================================================================== /** @@ -178,4 +178,4 @@ private: }; -#endif // BEAST_SYSTEMSTATS_BEASTHEADER +#endif // BEAST_SYSTEMSTATS_H_INCLUDED diff --git a/modules/beast_core/system/beast_TargetPlatform.h b/modules/beast_core/system/beast_TargetPlatform.h index ac88ca8dbc..4e60bf1d6d 100644 --- a/modules/beast_core/system/beast_TargetPlatform.h +++ b/modules/beast_core/system/beast_TargetPlatform.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TARGETPLATFORM_BEASTHEADER -#define BEAST_TARGETPLATFORM_BEASTHEADER +#ifndef BEAST_TARGETPLATFORM_H_INCLUDED +#define BEAST_TARGETPLATFORM_H_INCLUDED //============================================================================== /* This file figures out which platform is being built, and defines some macros @@ -213,4 +213,4 @@ #define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x) #define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:" -#endif // BEAST_TARGETPLATFORM_BEASTHEADER +#endif // BEAST_TARGETPLATFORM_H_INCLUDED diff --git a/modules/beast_core/text/beast_CharPointer_ASCII.h b/modules/beast_core/text/beast_CharPointer_ASCII.h index 8b09445ba4..7fc76609d2 100644 --- a/modules/beast_core/text/beast_CharPointer_ASCII.h +++ b/modules/beast_core/text/beast_CharPointer_ASCII.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_ASCII_BEASTHEADER -#define BEAST_CHARPOINTER_ASCII_BEASTHEADER +#ifndef BEAST_CHARPOINTER_ASCII_H_INCLUDED +#define BEAST_CHARPOINTER_ASCII_H_INCLUDED //============================================================================== @@ -379,4 +379,4 @@ private: }; -#endif // BEAST_CHARPOINTER_ASCII_BEASTHEADER +#endif // BEAST_CHARPOINTER_ASCII_H_INCLUDED diff --git a/modules/beast_core/text/beast_CharPointer_UTF16.h b/modules/beast_core/text/beast_CharPointer_UTF16.h index 22a0bdb213..918fc48c32 100644 --- a/modules/beast_core/text/beast_CharPointer_UTF16.h +++ b/modules/beast_core/text/beast_CharPointer_UTF16.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF16_BEASTHEADER -#define BEAST_CHARPOINTER_UTF16_BEASTHEADER +#ifndef BEAST_CHARPOINTER_UTF16_H_INCLUDED +#define BEAST_CHARPOINTER_UTF16_H_INCLUDED //============================================================================== @@ -493,4 +493,4 @@ private: }; -#endif // BEAST_CHARPOINTER_UTF16_BEASTHEADER +#endif // BEAST_CHARPOINTER_UTF16_H_INCLUDED diff --git a/modules/beast_core/text/beast_CharPointer_UTF32.h b/modules/beast_core/text/beast_CharPointer_UTF32.h index fe24978e18..879d9e22cc 100644 --- a/modules/beast_core/text/beast_CharPointer_UTF32.h +++ b/modules/beast_core/text/beast_CharPointer_UTF32.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF32_BEASTHEADER -#define BEAST_CHARPOINTER_UTF32_BEASTHEADER +#ifndef BEAST_CHARPOINTER_UTF32_H_INCLUDED +#define BEAST_CHARPOINTER_UTF32_H_INCLUDED //============================================================================== @@ -370,4 +370,4 @@ private: }; -#endif // BEAST_CHARPOINTER_UTF32_BEASTHEADER +#endif // BEAST_CHARPOINTER_UTF32_H_INCLUDED diff --git a/modules/beast_core/text/beast_CharPointer_UTF8.h b/modules/beast_core/text/beast_CharPointer_UTF8.h index 0b4720bd09..c35a0b07ba 100644 --- a/modules/beast_core/text/beast_CharPointer_UTF8.h +++ b/modules/beast_core/text/beast_CharPointer_UTF8.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARPOINTER_UTF8_BEASTHEADER -#define BEAST_CHARPOINTER_UTF8_BEASTHEADER +#ifndef BEAST_CHARPOINTER_UTF8_H_INCLUDED +#define BEAST_CHARPOINTER_UTF8_H_INCLUDED //============================================================================== /** @@ -557,4 +557,4 @@ private: CharType* data; }; -#endif // BEAST_CHARPOINTER_UTF8_BEASTHEADER +#endif // BEAST_CHARPOINTER_UTF8_H_INCLUDED diff --git a/modules/beast_core/text/beast_CharacterFunctions.h b/modules/beast_core/text/beast_CharacterFunctions.h index a8742a88b7..2ce3139fca 100644 --- a/modules/beast_core/text/beast_CharacterFunctions.h +++ b/modules/beast_core/text/beast_CharacterFunctions.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHARACTERFUNCTIONS_BEASTHEADER -#define BEAST_CHARACTERFUNCTIONS_BEASTHEADER +#ifndef BEAST_CHARACTERFUNCTIONS_H_INCLUDED +#define BEAST_CHARACTERFUNCTIONS_H_INCLUDED //============================================================================== @@ -582,4 +582,4 @@ private: }; -#endif // BEAST_CHARACTERFUNCTIONS_BEASTHEADER +#endif // BEAST_CHARACTERFUNCTIONS_H_INCLUDED diff --git a/modules/beast_core/text/beast_Identifier.h b/modules/beast_core/text/beast_Identifier.h index f3157bcfee..d9bdf7ef89 100644 --- a/modules/beast_core/text/beast_Identifier.h +++ b/modules/beast_core/text/beast_Identifier.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_IDENTIFIER_BEASTHEADER -#define BEAST_IDENTIFIER_BEASTHEADER +#ifndef BEAST_IDENTIFIER_H_INCLUDED +#define BEAST_IDENTIFIER_H_INCLUDED class StringPool; @@ -103,4 +103,4 @@ private: }; -#endif // BEAST_IDENTIFIER_BEASTHEADER +#endif // BEAST_IDENTIFIER_H_INCLUDED diff --git a/modules/beast_core/text/beast_LocalisedStrings.h b/modules/beast_core/text/beast_LocalisedStrings.h index 4e39c1fe53..8376a9c1cc 100644 --- a/modules/beast_core/text/beast_LocalisedStrings.h +++ b/modules/beast_core/text/beast_LocalisedStrings.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_LOCALISEDSTRINGS_BEASTHEADER -#define BEAST_LOCALISEDSTRINGS_BEASTHEADER +#ifndef BEAST_LOCALISEDSTRINGS_H_INCLUDED +#define BEAST_LOCALISEDSTRINGS_H_INCLUDED #include "beast_StringPairArray.h" #include "../files/beast_File.h" @@ -219,4 +219,4 @@ String translate (CharPointer_UTF8 stringLiteral); String translate (const String& stringLiteral, const String& resultIfNotFound); -#endif // BEAST_LOCALISEDSTRINGS_BEASTHEADER +#endif // BEAST_LOCALISEDSTRINGS_H_INCLUDED diff --git a/modules/beast_core/text/beast_NewLine.h b/modules/beast_core/text/beast_NewLine.h index 4256d29470..d5cf0fae39 100644 --- a/modules/beast_core/text/beast_NewLine.h +++ b/modules/beast_core/text/beast_NewLine.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_NEWLINE_BEASTHEADER -#define BEAST_NEWLINE_BEASTHEADER +#ifndef BEAST_NEWLINE_H_INCLUDED +#define BEAST_NEWLINE_H_INCLUDED //============================================================================== @@ -70,4 +70,4 @@ extern NewLine newLine; BEAST_API String& BEAST_CALLTYPE operator<< (String& string1, const NewLine&); -#endif // BEAST_NEWLINE_BEASTHEADER +#endif // BEAST_NEWLINE_H_INCLUDED diff --git a/modules/beast_core/text/beast_String.h b/modules/beast_core/text/beast_String.h index 0d4b999759..980ea4cd52 100644 --- a/modules/beast_core/text/beast_String.h +++ b/modules/beast_core/text/beast_String.h @@ -21,31 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRING_BEASTHEADER -#define BEAST_STRING_BEASTHEADER - -#include "beast_CharacterFunctions.h" - -#ifndef BEAST_STRING_UTF_TYPE - #define BEAST_STRING_UTF_TYPE 8 -#endif - -#if BEAST_MSVC - #pragma warning (push) - #pragma warning (disable: 4514 4996) -#endif - -#include "../memory/beast_Atomic.h" -#include "beast_CharPointer_UTF8.h" -#include "beast_CharPointer_UTF16.h" -#include "beast_CharPointer_UTF32.h" -#include "beast_CharPointer_ASCII.h" - -#if BEAST_MSVC - #pragma warning (pop) -#endif - -class OutputStream; +#ifndef BEAST_STRING_H_INCLUDED +#define BEAST_STRING_H_INCLUDED //============================================================================== /** @@ -1354,4 +1331,4 @@ std::basic_ostream & BEAST_CALLTYPE operator<< (std::basic_ostr BEAST_API OutputStream& BEAST_CALLTYPE operator<< (OutputStream& stream, const String& stringToWrite); -#endif // BEAST_STRING_BEASTHEADER +#endif // BEAST_STRING_H_INCLUDED diff --git a/modules/beast_core/text/beast_StringArray.h b/modules/beast_core/text/beast_StringArray.h index b98932d8f7..370f076183 100644 --- a/modules/beast_core/text/beast_StringArray.h +++ b/modules/beast_core/text/beast_StringArray.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRINGARRAY_BEASTHEADER -#define BEAST_STRINGARRAY_BEASTHEADER +#ifndef BEAST_STRINGARRAY_H_INCLUDED +#define BEAST_STRINGARRAY_H_INCLUDED #include "beast_String.h" #include "../containers/beast_Array.h" @@ -409,4 +409,4 @@ private: }; -#endif // BEAST_STRINGARRAY_BEASTHEADER +#endif // BEAST_STRINGARRAY_H_INCLUDED diff --git a/modules/beast_core/text/beast_StringPairArray.h b/modules/beast_core/text/beast_StringPairArray.h index 3e3fdfc93f..8a46266ff7 100644 --- a/modules/beast_core/text/beast_StringPairArray.h +++ b/modules/beast_core/text/beast_StringPairArray.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRINGPAIRARRAY_BEASTHEADER -#define BEAST_STRINGPAIRARRAY_BEASTHEADER +#ifndef BEAST_STRINGPAIRARRAY_H_INCLUDED +#define BEAST_STRINGPAIRARRAY_H_INCLUDED #include "beast_StringArray.h" @@ -153,4 +153,4 @@ private: }; -#endif // BEAST_STRINGPAIRARRAY_BEASTHEADER +#endif // BEAST_STRINGPAIRARRAY_H_INCLUDED diff --git a/modules/beast_core/text/beast_StringPool.h b/modules/beast_core/text/beast_StringPool.h index d991209429..aec882aa55 100644 --- a/modules/beast_core/text/beast_StringPool.h +++ b/modules/beast_core/text/beast_StringPool.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_STRINGPOOL_BEASTHEADER -#define BEAST_STRINGPOOL_BEASTHEADER +#ifndef BEAST_STRINGPOOL_H_INCLUDED +#define BEAST_STRINGPOOL_H_INCLUDED #include "beast_String.h" #include "../containers/beast_Array.h" @@ -87,4 +87,4 @@ private: }; -#endif // BEAST_STRINGPOOL_BEASTHEADER +#endif // BEAST_STRINGPOOL_H_INCLUDED diff --git a/modules/beast_core/text/beast_TextDiff.h b/modules/beast_core/text/beast_TextDiff.h index 514c8d0c41..2e900b9996 100644 --- a/modules/beast_core/text/beast_TextDiff.h +++ b/modules/beast_core/text/beast_TextDiff.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TEXTDIFF_BEASTHEADER -#define BEAST_TEXTDIFF_BEASTHEADER +#ifndef BEAST_TEXTDIFF_H_INCLUDED +#define BEAST_TEXTDIFF_H_INCLUDED /** @@ -72,4 +72,4 @@ public: }; -#endif // BEAST_TEXTDIFF_BEASTHEADER +#endif // BEAST_TEXTDIFF_H_INCLUDED diff --git a/modules/beast_core/thread/beast_CallQueue.h b/modules/beast_core/thread/beast_CallQueue.h index 26fa5b8c93..352844e028 100644 --- a/modules/beast_core/thread/beast_CallQueue.h +++ b/modules/beast_core/thread/beast_CallQueue.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CALLQUEUE_BEASTHEADER -#define BEAST_CALLQUEUE_BEASTHEADER +#ifndef BEAST_CALLQUEUE_H_INCLUDED +#define BEAST_CALLQUEUE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_ConcurrentObject.h b/modules/beast_core/thread/beast_ConcurrentObject.h index de0dc327ba..e298e900f6 100644 --- a/modules/beast_core/thread/beast_ConcurrentObject.h +++ b/modules/beast_core/thread/beast_ConcurrentObject.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_CONCURRENTOBJECT_BEASTHEADER -#define BEAST_CONCURRENTOBJECT_BEASTHEADER +#ifndef BEAST_CONCURRENTOBJECT_H_INCLUDED +#define BEAST_CONCURRENTOBJECT_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_GlobalThreadGroup.h b/modules/beast_core/thread/beast_GlobalThreadGroup.h index 38bf7dd013..689b258b9c 100644 --- a/modules/beast_core/thread/beast_GlobalThreadGroup.h +++ b/modules/beast_core/thread/beast_GlobalThreadGroup.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_GLOBALTHREADGROUP_BEASTHEADER -#define BEAST_GLOBALTHREADGROUP_BEASTHEADER +#ifndef BEAST_GLOBALTHREADGROUP_H_INCLUDED +#define BEAST_GLOBALTHREADGROUP_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_InterruptibleThread.h b/modules/beast_core/thread/beast_InterruptibleThread.h index f464fc751b..bf78b45f64 100644 --- a/modules/beast_core/thread/beast_InterruptibleThread.h +++ b/modules/beast_core/thread/beast_InterruptibleThread.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_INTERRUPTIBLETHREAD_BEASTHEADER -#define BEAST_INTERRUPTIBLETHREAD_BEASTHEADER +#ifndef BEAST_INTERRUPTIBLETHREAD_H_INCLUDED +#define BEAST_INTERRUPTIBLETHREAD_H_INCLUDED //============================================================================== /** diff --git a/modules/beast_core/thread/beast_Listeners.h b/modules/beast_core/thread/beast_Listeners.h index 1b8997df72..c4ba90ef17 100644 --- a/modules/beast_core/thread/beast_Listeners.h +++ b/modules/beast_core/thread/beast_Listeners.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_LISTENERS_BEASTHEADER -#define BEAST_LISTENERS_BEASTHEADER +#ifndef BEAST_LISTENERS_H_INCLUDED +#define BEAST_LISTENERS_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_OncePerSecond.h b/modules/beast_core/thread/beast_OncePerSecond.h index 71a42e91c4..64353eeee2 100644 --- a/modules/beast_core/thread/beast_OncePerSecond.h +++ b/modules/beast_core/thread/beast_OncePerSecond.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_ONCEPERSECOND_BEASTHEADER -#define BEAST_ONCEPERSECOND_BEASTHEADER +#ifndef BEAST_ONCEPERSECOND_H_INCLUDED +#define BEAST_ONCEPERSECOND_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_ParallelFor.h b/modules/beast_core/thread/beast_ParallelFor.h index d6e8bbedaa..f6634357b0 100644 --- a/modules/beast_core/thread/beast_ParallelFor.h +++ b/modules/beast_core/thread/beast_ParallelFor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_PARALLELFOR_BEASTHEADER -#define BEAST_PARALLELFOR_BEASTHEADER +#ifndef BEAST_PARALLELFOR_H_INCLUDED +#define BEAST_PARALLELFOR_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_Semaphore.h b/modules/beast_core/thread/beast_Semaphore.h index 7726660c64..f261b51e0f 100644 --- a/modules/beast_core/thread/beast_Semaphore.h +++ b/modules/beast_core/thread/beast_Semaphore.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SEMAPHORE_BEASTHEADER -#define BEAST_SEMAPHORE_BEASTHEADER +#ifndef BEAST_SEMAPHORE_H_INCLUDED +#define BEAST_SEMAPHORE_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_SerialFor.h b/modules/beast_core/thread/beast_SerialFor.h index 538a7110cc..91de0178f2 100644 --- a/modules/beast_core/thread/beast_SerialFor.h +++ b/modules/beast_core/thread/beast_SerialFor.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SERIALFOR_BEASTHEADER -#define BEAST_SERIALFOR_BEASTHEADER +#ifndef BEAST_SERIALFOR_H_INCLUDED +#define BEAST_SERIALFOR_H_INCLUDED /*============================================================================*/ diff --git a/modules/beast_core/thread/beast_ThreadGroup.h b/modules/beast_core/thread/beast_ThreadGroup.h index 58795b7f97..5e9a3e9650 100644 --- a/modules/beast_core/thread/beast_ThreadGroup.h +++ b/modules/beast_core/thread/beast_ThreadGroup.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_THREADGROUP_BEASTHEADER -#define BEAST_THREADGROUP_BEASTHEADER +#ifndef BEAST_THREADGROUP_H_INCLUDED +#define BEAST_THREADGROUP_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/thread/beast_ThreadWithCallQueue.h b/modules/beast_core/thread/beast_ThreadWithCallQueue.h index 1db2021f76..b417927e5a 100644 --- a/modules/beast_core/thread/beast_ThreadWithCallQueue.h +++ b/modules/beast_core/thread/beast_ThreadWithCallQueue.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_THREADWITHCALLQUEUE_BEASTHEADER -#define BEAST_THREADWITHCALLQUEUE_BEASTHEADER +#ifndef BEAST_THREADWITHCALLQUEUE_H_INCLUDED +#define BEAST_THREADWITHCALLQUEUE_H_INCLUDED /** An InterruptibleThread with a CallQueue. diff --git a/modules/beast_core/threads/beast_ChildProcess.h b/modules/beast_core/threads/beast_ChildProcess.h index ae6a380679..142f34d63c 100644 --- a/modules/beast_core/threads/beast_ChildProcess.h +++ b/modules/beast_core/threads/beast_ChildProcess.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CHILDPROCESS_BEASTHEADER -#define BEAST_CHILDPROCESS_BEASTHEADER +#ifndef BEAST_CHILDPROCESS_H_INCLUDED +#define BEAST_CHILDPROCESS_H_INCLUDED //============================================================================== @@ -95,4 +95,4 @@ private: }; -#endif // BEAST_CHILDPROCESS_BEASTHEADER +#endif // BEAST_CHILDPROCESS_H_INCLUDED diff --git a/modules/beast_core/threads/beast_CriticalSection.h b/modules/beast_core/threads/beast_CriticalSection.h index 23d27cc620..d31d01a041 100644 --- a/modules/beast_core/threads/beast_CriticalSection.h +++ b/modules/beast_core/threads/beast_CriticalSection.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_CRITICALSECTION_BEASTHEADER -#define BEAST_CRITICALSECTION_BEASTHEADER +#ifndef BEAST_CRITICALSECTION_H_INCLUDED +#define BEAST_CRITICALSECTION_H_INCLUDED #include "beast_ScopedLock.h" @@ -258,4 +258,4 @@ typedef CriticalSection::ScopedUnlockType ScopedUnlock; typedef CriticalSection::ScopedTryLockType ScopedTryLock; -#endif // BEAST_CRITICALSECTION_BEASTHEADER +#endif // BEAST_CRITICALSECTION_H_INCLUDED diff --git a/modules/beast_core/threads/beast_DynamicLibrary.h b/modules/beast_core/threads/beast_DynamicLibrary.h index 2c29219e83..679195924e 100644 --- a/modules/beast_core/threads/beast_DynamicLibrary.h +++ b/modules/beast_core/threads/beast_DynamicLibrary.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_DYNAMICLIBRARY_BEASTHEADER -#define BEAST_DYNAMICLIBRARY_BEASTHEADER +#ifndef BEAST_DYNAMICLIBRARY_H_INCLUDED +#define BEAST_DYNAMICLIBRARY_H_INCLUDED /** Handles the opening and closing of DLLs. @@ -75,4 +75,4 @@ private: }; -#endif // BEAST_DYNAMICLIBRARY_BEASTHEADER +#endif // BEAST_DYNAMICLIBRARY_H_INCLUDED diff --git a/modules/beast_core/threads/beast_HighResolutionTimer.h b/modules/beast_core/threads/beast_HighResolutionTimer.h index cba759abf2..9cc391611c 100644 --- a/modules/beast_core/threads/beast_HighResolutionTimer.h +++ b/modules/beast_core/threads/beast_HighResolutionTimer.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_HIGHRESOLUTIONTIMER_BEASTHEADER -#define BEAST_HIGHRESOLUTIONTIMER_BEASTHEADER +#ifndef BEAST_HIGHRESOLUTIONTIMER_H_INCLUDED +#define BEAST_HIGHRESOLUTIONTIMER_H_INCLUDED /** A high-resolution periodic timer. @@ -99,4 +99,4 @@ private: }; -#endif // BEAST_HIGHRESOLUTIONTIMER_BEASTHEADER +#endif // BEAST_HIGHRESOLUTIONTIMER_H_INCLUDED diff --git a/modules/beast_core/threads/beast_InterProcessLock.h b/modules/beast_core/threads/beast_InterProcessLock.h index 43a83580f4..4582d402de 100644 --- a/modules/beast_core/threads/beast_InterProcessLock.h +++ b/modules/beast_core/threads/beast_InterProcessLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_INTERPROCESSLOCK_BEASTHEADER -#define BEAST_INTERPROCESSLOCK_BEASTHEADER +#ifndef BEAST_INTERPROCESSLOCK_H_INCLUDED +#define BEAST_INTERPROCESSLOCK_H_INCLUDED #include "../text/beast_String.h" #include "../memory/beast_ScopedPointer.h" @@ -119,4 +119,4 @@ private: }; -#endif // BEAST_INTERPROCESSLOCK_BEASTHEADER +#endif // BEAST_INTERPROCESSLOCK_H_INCLUDED diff --git a/modules/beast_core/threads/beast_Process.h b/modules/beast_core/threads/beast_Process.h index d9a56804c5..f7f410ba32 100644 --- a/modules/beast_core/threads/beast_Process.h +++ b/modules/beast_core/threads/beast_Process.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_PROCESS_BEASTHEADER -#define BEAST_PROCESS_BEASTHEADER +#ifndef BEAST_PROCESS_H_INCLUDED +#define BEAST_PROCESS_H_INCLUDED #include "../text/beast_String.h" @@ -141,4 +141,4 @@ private: }; -#endif // BEAST_PROCESS_BEASTHEADER +#endif // BEAST_PROCESS_H_INCLUDED diff --git a/modules/beast_core/threads/beast_ReadWriteLock.h b/modules/beast_core/threads/beast_ReadWriteLock.h index b5eb6ab9ee..175a824323 100644 --- a/modules/beast_core/threads/beast_ReadWriteLock.h +++ b/modules/beast_core/threads/beast_ReadWriteLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_READWRITELOCK_BEASTHEADER -#define BEAST_READWRITELOCK_BEASTHEADER +#ifndef BEAST_READWRITELOCK_H_INCLUDED +#define BEAST_READWRITELOCK_H_INCLUDED #include "beast_CriticalSection.h" #include "beast_SpinLock.h" @@ -149,4 +149,4 @@ private: }; -#endif // BEAST_READWRITELOCK_BEASTHEADER +#endif // BEAST_READWRITELOCK_H_INCLUDED diff --git a/modules/beast_core/threads/beast_ReadWriteMutex.h b/modules/beast_core/threads/beast_ReadWriteMutex.h index 3ab273863d..05b87750ce 100644 --- a/modules/beast_core/threads/beast_ReadWriteMutex.h +++ b/modules/beast_core/threads/beast_ReadWriteMutex.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_READWRITEMUTEX_BEASTHEADER -#define BEAST_READWRITEMUTEX_BEASTHEADER +#ifndef BEAST_READWRITEMUTEX_H_INCLUDED +#define BEAST_READWRITEMUTEX_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/threads/beast_ScopedLock.h b/modules/beast_core/threads/beast_ScopedLock.h index 5d09a59802..e30d68efe5 100644 --- a/modules/beast_core/threads/beast_ScopedLock.h +++ b/modules/beast_core/threads/beast_ScopedLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDLOCK_BEASTHEADER -#define BEAST_SCOPEDLOCK_BEASTHEADER +#ifndef BEAST_SCOPEDLOCK_H_INCLUDED +#define BEAST_SCOPEDLOCK_H_INCLUDED //============================================================================== /** diff --git a/modules/beast_core/threads/beast_ScopedReadLock.h b/modules/beast_core/threads/beast_ScopedReadLock.h index 1f5620c58f..0285409184 100644 --- a/modules/beast_core/threads/beast_ScopedReadLock.h +++ b/modules/beast_core/threads/beast_ScopedReadLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDREADLOCK_BEASTHEADER -#define BEAST_SCOPEDREADLOCK_BEASTHEADER +#ifndef BEAST_SCOPEDREADLOCK_H_INCLUDED +#define BEAST_SCOPEDREADLOCK_H_INCLUDED #include "beast_ReadWriteLock.h" @@ -82,4 +82,4 @@ private: }; -#endif // BEAST_SCOPEDREADLOCK_BEASTHEADER +#endif // BEAST_SCOPEDREADLOCK_H_INCLUDED diff --git a/modules/beast_core/threads/beast_ScopedWriteLock.h b/modules/beast_core/threads/beast_ScopedWriteLock.h index 798d22522a..99ad573a9a 100644 --- a/modules/beast_core/threads/beast_ScopedWriteLock.h +++ b/modules/beast_core/threads/beast_ScopedWriteLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SCOPEDWRITELOCK_BEASTHEADER -#define BEAST_SCOPEDWRITELOCK_BEASTHEADER +#ifndef BEAST_SCOPEDWRITELOCK_H_INCLUDED +#define BEAST_SCOPEDWRITELOCK_H_INCLUDED #include "beast_ReadWriteLock.h" @@ -82,4 +82,4 @@ private: }; -#endif // BEAST_SCOPEDWRITELOCK_BEASTHEADER +#endif // BEAST_SCOPEDWRITELOCK_H_INCLUDED diff --git a/modules/beast_core/threads/beast_SpinDelay.h b/modules/beast_core/threads/beast_SpinDelay.h index c51d4ce4ce..4965445ed0 100644 --- a/modules/beast_core/threads/beast_SpinDelay.h +++ b/modules/beast_core/threads/beast_SpinDelay.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_SPINDELAY_BEASTHEADER -#define BEAST_SPINDELAY_BEASTHEADER +#ifndef BEAST_SPINDELAY_H_INCLUDED +#define BEAST_SPINDELAY_H_INCLUDED /** A simple delay used to synchronize threads. */ diff --git a/modules/beast_core/threads/beast_SpinLock.h b/modules/beast_core/threads/beast_SpinLock.h index 97b9857409..e93a1e7504 100644 --- a/modules/beast_core/threads/beast_SpinLock.h +++ b/modules/beast_core/threads/beast_SpinLock.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_SPINLOCK_BEASTHEADER -#define BEAST_SPINLOCK_BEASTHEADER +#ifndef BEAST_SPINLOCK_H_INCLUDED +#define BEAST_SPINLOCK_H_INCLUDED #include "beast_ScopedLock.h" @@ -83,4 +83,4 @@ private: }; -#endif // BEAST_SPINLOCK_BEASTHEADER +#endif // BEAST_SPINLOCK_H_INCLUDED diff --git a/modules/beast_core/threads/beast_Thread.h b/modules/beast_core/threads/beast_Thread.h index 716a79c67d..78d85bcfd2 100644 --- a/modules/beast_core/threads/beast_Thread.h +++ b/modules/beast_core/threads/beast_Thread.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_THREAD_BEASTHEADER -#define BEAST_THREAD_BEASTHEADER +#ifndef BEAST_THREAD_H_INCLUDED +#define BEAST_THREAD_H_INCLUDED #include "beast_WaitableEvent.h" #include "beast_CriticalSection.h" @@ -281,4 +281,4 @@ private: static bool setThreadPriority (void*, int); }; -#endif // BEAST_THREAD_BEASTHEADER +#endif // BEAST_THREAD_H_INCLUDED diff --git a/modules/beast_core/threads/beast_ThreadLocalValue.h b/modules/beast_core/threads/beast_ThreadLocalValue.h index acd4ca64e0..af623adbed 100644 --- a/modules/beast_core/threads/beast_ThreadLocalValue.h +++ b/modules/beast_core/threads/beast_ThreadLocalValue.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_THREADLOCALVALUE_BEASTHEADER -#define BEAST_THREADLOCALVALUE_BEASTHEADER +#ifndef BEAST_THREADLOCALVALUE_H_INCLUDED +#define BEAST_THREADLOCALVALUE_H_INCLUDED // (NB: on win32, native thread-locals aren't possible in a dynamically loaded DLL in XP). #if ! ((BEAST_MSVC && (BEAST_64BIT || ! defined (BeastPlugin_PluginCode))) \ @@ -187,4 +187,4 @@ private: }; -#endif // BEAST_THREADLOCALVALUE_BEASTHEADER +#endif // BEAST_THREADLOCALVALUE_H_INCLUDED diff --git a/modules/beast_core/threads/beast_ThreadPool.h b/modules/beast_core/threads/beast_ThreadPool.h index 79cc74f49b..cf7ee3ed75 100644 --- a/modules/beast_core/threads/beast_ThreadPool.h +++ b/modules/beast_core/threads/beast_ThreadPool.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_THREADPOOL_BEASTHEADER -#define BEAST_THREADPOOL_BEASTHEADER +#ifndef BEAST_THREADPOOL_H_INCLUDED +#define BEAST_THREADPOOL_H_INCLUDED #include "beast_Thread.h" #include "../text/beast_StringArray.h" @@ -306,4 +306,4 @@ private: }; -#endif // BEAST_THREADPOOL_BEASTHEADER +#endif // BEAST_THREADPOOL_H_INCLUDED diff --git a/modules/beast_core/threads/beast_TimeSliceThread.h b/modules/beast_core/threads/beast_TimeSliceThread.h index ca0b7cc25a..94b9c684b8 100644 --- a/modules/beast_core/threads/beast_TimeSliceThread.h +++ b/modules/beast_core/threads/beast_TimeSliceThread.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TIMESLICETHREAD_BEASTHEADER -#define BEAST_TIMESLICETHREAD_BEASTHEADER +#ifndef BEAST_TIMESLICETHREAD_H_INCLUDED +#define BEAST_TIMESLICETHREAD_H_INCLUDED #include "beast_Thread.h" #include "../containers/beast_Array.h" @@ -144,4 +144,4 @@ private: }; -#endif // BEAST_TIMESLICETHREAD_BEASTHEADER +#endif // BEAST_TIMESLICETHREAD_H_INCLUDED diff --git a/modules/beast_core/threads/beast_WaitableEvent.h b/modules/beast_core/threads/beast_WaitableEvent.h index ee71c2dc3b..5b8f47a70e 100644 --- a/modules/beast_core/threads/beast_WaitableEvent.h +++ b/modules/beast_core/threads/beast_WaitableEvent.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_WAITABLEEVENT_BEASTHEADER -#define BEAST_WAITABLEEVENT_BEASTHEADER +#ifndef BEAST_WAITABLEEVENT_H_INCLUDED +#define BEAST_WAITABLEEVENT_H_INCLUDED #include "../text/beast_String.h" @@ -112,4 +112,4 @@ private: }; -#endif // BEAST_WAITABLEEVENT_BEASTHEADER +#endif // BEAST_WAITABLEEVENT_H_INCLUDED diff --git a/modules/beast_core/time/beast_PerformanceCounter.h b/modules/beast_core/time/beast_PerformanceCounter.h index 039876487a..8063d60fbc 100644 --- a/modules/beast_core/time/beast_PerformanceCounter.h +++ b/modules/beast_core/time/beast_PerformanceCounter.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_PERFORMANCECOUNTER_BEASTHEADER -#define BEAST_PERFORMANCECOUNTER_BEASTHEADER +#ifndef BEAST_PERFORMANCECOUNTER_H_INCLUDED +#define BEAST_PERFORMANCECOUNTER_H_INCLUDED #include "../files/beast_File.h" @@ -101,4 +101,4 @@ private: File outputFile; }; -#endif // BEAST_PERFORMANCECOUNTER_BEASTHEADER +#endif // BEAST_PERFORMANCECOUNTER_H_INCLUDED diff --git a/modules/beast_core/time/beast_PerformedAtExit.h b/modules/beast_core/time/beast_PerformedAtExit.h index 0c79d3646f..9cde4ff713 100644 --- a/modules/beast_core/time/beast_PerformedAtExit.h +++ b/modules/beast_core/time/beast_PerformedAtExit.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef BEAST_PERFORMEDATEXIT_BEASTHEADER -#define BEAST_PERFORMEDATEXIT_BEASTHEADER +#ifndef BEAST_PERFORMEDATEXIT_H_INCLUDED +#define BEAST_PERFORMEDATEXIT_H_INCLUDED /*============================================================================*/ /** diff --git a/modules/beast_core/time/beast_RelativeTime.h b/modules/beast_core/time/beast_RelativeTime.h index f4bc9c4873..e26cd086bc 100644 --- a/modules/beast_core/time/beast_RelativeTime.h +++ b/modules/beast_core/time/beast_RelativeTime.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_RELATIVETIME_BEASTHEADER -#define BEAST_RELATIVETIME_BEASTHEADER +#ifndef BEAST_RELATIVETIME_H_INCLUDED +#define BEAST_RELATIVETIME_H_INCLUDED #include "../text/beast_String.h" @@ -176,4 +176,4 @@ RelativeTime operator+ (RelativeTime t1, RelativeTime t2) noexcept; /** Subtracts two RelativeTimes. */ RelativeTime operator- (RelativeTime t1, RelativeTime t2) noexcept; -#endif // BEAST_RELATIVETIME_BEASTHEADER +#endif // BEAST_RELATIVETIME_H_INCLUDED diff --git a/modules/beast_core/time/beast_Time.h b/modules/beast_core/time/beast_Time.h index a4717c47c9..e2420630ca 100644 --- a/modules/beast_core/time/beast_Time.h +++ b/modules/beast_core/time/beast_Time.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_TIME_BEASTHEADER -#define BEAST_TIME_BEASTHEADER +#ifndef BEAST_TIME_H_INCLUDED +#define BEAST_TIME_H_INCLUDED #include "beast_RelativeTime.h" @@ -398,4 +398,4 @@ BEAST_API bool operator> (Time time1, Time time2); BEAST_API bool operator>= (Time time1, Time time2); -#endif // BEAST_TIME_BEASTHEADER +#endif // BEAST_TIME_H_INCLUDED diff --git a/modules/beast_core/xml/beast_XmlDocument.h b/modules/beast_core/xml/beast_XmlDocument.h index 3f9a48d03d..0802b8018a 100644 --- a/modules/beast_core/xml/beast_XmlDocument.h +++ b/modules/beast_core/xml/beast_XmlDocument.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_XMLDOCUMENT_BEASTHEADER -#define BEAST_XMLDOCUMENT_BEASTHEADER +#ifndef BEAST_XMLDOCUMENT_H_INCLUDED +#define BEAST_XMLDOCUMENT_H_INCLUDED #include "beast_XmlElement.h" #include "../text/beast_StringArray.h" @@ -176,4 +176,4 @@ private: }; -#endif // BEAST_XMLDOCUMENT_BEASTHEADER +#endif // BEAST_XMLDOCUMENT_H_INCLUDED diff --git a/modules/beast_core/xml/beast_XmlElement.h b/modules/beast_core/xml/beast_XmlElement.h index 042c2274f6..9a453f88cc 100644 --- a/modules/beast_core/xml/beast_XmlElement.h +++ b/modules/beast_core/xml/beast_XmlElement.h @@ -21,8 +21,8 @@ */ //============================================================================== -#ifndef BEAST_XMLELEMENT_BEASTHEADER -#define BEAST_XMLELEMENT_BEASTHEADER +#ifndef BEAST_XMLELEMENT_H_INCLUDED +#define BEAST_XMLELEMENT_H_INCLUDED #include "../text/beast_String.h" #include "../streams/beast_OutputStream.h" @@ -729,4 +729,4 @@ private: }; -#endif // BEAST_XMLELEMENT_BEASTHEADER +#endif // BEAST_XMLELEMENT_H_INCLUDED diff --git a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.h b/modules/beast_core/zip/beast_GZIPCompressorOutputStream.h index d13e72802a..466747da6a 100644 --- a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.h +++ b/modules/beast_core/zip/beast_GZIPCompressorOutputStream.h @@ -26,8 +26,8 @@ ============================================================================== */ -#ifndef BEAST_GZIPCOMPRESSOROUTPUTSTREAM_BEASTHEADER -#define BEAST_GZIPCOMPRESSOROUTPUTSTREAM_BEASTHEADER +#ifndef BEAST_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED +#define BEAST_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED #include "../streams/beast_OutputStream.h" #include "../memory/beast_OptionalScopedPointer.h" @@ -102,4 +102,4 @@ private: ScopedPointer helper; }; -#endif // BEAST_GZIPCOMPRESSOROUTPUTSTREAM_BEASTHEADER +#endif // BEAST_GZIPCOMPRESSOROUTPUTSTREAM_H_INCLUDED diff --git a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.h b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.h index e77444a0ae..47c7afb379 100644 --- a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.h +++ b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.h @@ -26,8 +26,8 @@ ============================================================================== */ -#ifndef BEAST_GZIPDECOMPRESSORINPUTSTREAM_BEASTHEADER -#define BEAST_GZIPDECOMPRESSORINPUTSTREAM_BEASTHEADER +#ifndef BEAST_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED +#define BEAST_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED #include "../streams/beast_InputStream.h" #include "../memory/beast_OptionalScopedPointer.h" @@ -99,4 +99,4 @@ private: ScopedPointer helper; }; -#endif // BEAST_GZIPDECOMPRESSORINPUTSTREAM_BEASTHEADER +#endif // BEAST_GZIPDECOMPRESSORINPUTSTREAM_H_INCLUDED diff --git a/modules/beast_core/zip/beast_ZipFile.h b/modules/beast_core/zip/beast_ZipFile.h index c5ea0f84ee..881cae8d80 100644 --- a/modules/beast_core/zip/beast_ZipFile.h +++ b/modules/beast_core/zip/beast_ZipFile.h @@ -26,8 +26,8 @@ ============================================================================== */ -#ifndef BEAST_ZIPFILE_BEASTHEADER -#define BEAST_ZIPFILE_BEASTHEADER +#ifndef BEAST_ZIPFILE_H_INCLUDED +#define BEAST_ZIPFILE_H_INCLUDED #include "../files/beast_File.h" #include "../streams/beast_InputSource.h" @@ -242,4 +242,4 @@ private: void init(); }; -#endif // BEAST_ZIPFILE_BEASTHEADER +#endif // BEAST_ZIPFILE_H_INCLUDED