Tidy up includes and header material

Subtrees/beast/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

Subtrees/beast/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 <typename T>
 struct SharedHandlerAllocator;

Subtrees/beast/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.
 

Subtrees/beast/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.
 

Subtrees/beast/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.
 

Subtrees/beast/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.
 

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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
 {

Subtrees/beast/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
 

Subtrees/beast/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
 //

Subtrees/beast/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)
 //

Subtrees/beast/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
 
 //------------------------------------------------------------------------------
 

Subtrees/beast/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
 {

Subtrees/beast/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.
 

Subtrees/beast/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.
 

Subtrees/beast/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.

Subtrees/beast/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.
 

Subtrees/beast/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)

Subtrees/beast/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 <openssl/opensslconf.h>

Subtrees/beast/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.
 */

Subtrees/beast/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.
 */

Subtrees/beast/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.
 

Subtrees/beast/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.
 */

Subtrees/beast/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
 */

Subtrees/beast/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.
 */

Subtrees/beast/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
 {

Subtrees/beast/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
 {

Subtrees/beast/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

Subtrees/beast/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
 {

Subtrees/beast/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
 {

Subtrees/beast/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 <typename Logic, typename Details>
 class TestPeerType

Subtrees/beast/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

Subtrees/beast/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"

Subtrees/beast/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
 
 //==============================================================================
 /**

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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
 

Subtrees/beast/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;
 

Subtrees/beast/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

Subtrees/beast/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.

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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.
 

Subtrees/beast/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.
 

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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.
 

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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`.
 

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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"

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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:

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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.
 

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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
 

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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<Type>::memoryBarrier() noexcept
   #pragma warning (pop)
 #endif
 
-#endif   // BEAST_ATOMIC_BEASTHEADER
+#endif   // BEAST_ATOMIC_H_INCLUDED

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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.

Subtrees/beast/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.
 

Subtrees/beast/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
 

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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

Subtrees/beast/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. */

Subtrees/beast/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
 {

Subtrees/beast/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

Subtrees/beast/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

Subtrees/beast/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
 
 /*============================================================================*/
 /**

Subtrees/beast/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 <typename Type>
 void deleteAndZero (ScopedPointer<Type>&)  { static_bassert (sizeof (Type) == 12345); }
 #endif
 
-#endif   // BEAST_SCOPEDPOINTER_BEASTHEADER
+#endif   // BEAST_SCOPEDPOINTER_H_INCLUDED

Subtrees/beast/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<Object>& object2) noexcept
 }
 
 
-#endif   // BEAST_REFERENCECOUNTEDOBJECT_BEASTHEADER
+#endif   // BEAST_REFERENCECOUNTEDOBJECT_H_INCLUDED

Subtrees/beast/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

Subtrees/beast/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.

Subtrees/beast/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

Subtrees/beast/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"
 

Subtrees/beast/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

Subtrees/beast/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