diff --git a/modules/beast_basics/events/beast_OncePerSecond.h b/modules/beast_basics/events/beast_OncePerSecond.h index 8240c2e99..71a42e91c 100644 --- a/modules/beast_basics/events/beast_OncePerSecond.h +++ b/modules/beast_basics/events/beast_OncePerSecond.h @@ -30,7 +30,7 @@ @ingroup beast_core */ -class BEAST_API OncePerSecond : Uncopyable +class BEAST_API OncePerSecond : public Uncopyable { public: OncePerSecond (); diff --git a/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp b/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp index b868937eb..4888891ee 100644 --- a/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp +++ b/modules/beast_basics/memory/beast_FifoFreeStoreWithTLS.cpp @@ -43,7 +43,7 @@ struct FifoFreeStoreWithTLS::Header //------------------------------------------------------------------------------ -class FifoFreeStoreWithTLS::Page : LeakChecked , Uncopyable +class FifoFreeStoreWithTLS::Page : LeakChecked , public Uncopyable { public: explicit Page (const size_t bytes) : m_refs (1) @@ -94,7 +94,7 @@ private: //------------------------------------------------------------------------------ -class FifoFreeStoreWithTLS::PerThreadData : LeakChecked , Uncopyable +class FifoFreeStoreWithTLS::PerThreadData : LeakChecked , public Uncopyable { public: explicit PerThreadData (FifoFreeStoreWithTLS* allocator) diff --git a/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp b/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp index bc8d9b96d..07502eefd 100644 --- a/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp +++ b/modules/beast_basics/memory/beast_FifoFreeStoreWithoutTLS.cpp @@ -30,7 +30,7 @@ struct FifoFreeStoreWithoutTLS::Header //------------------------------------------------------------------------------ -class FifoFreeStoreWithoutTLS::Block : Uncopyable +class FifoFreeStoreWithoutTLS::Block : public Uncopyable { public: explicit Block (const size_t bytes) : m_refs (1) diff --git a/modules/beast_basics/threads/beast_ParallelFor.h b/modules/beast_basics/threads/beast_ParallelFor.h index 77f19df07..d6e8bbeda 100644 --- a/modules/beast_basics/threads/beast_ParallelFor.h +++ b/modules/beast_basics/threads/beast_ParallelFor.h @@ -52,7 +52,7 @@ @ingroup beast_concurrent */ -class BEAST_API ParallelFor : Uncopyable +class BEAST_API ParallelFor : public Uncopyable { public: /** Create a parallel for loop. @@ -153,7 +153,7 @@ private: }; template - class IterationType : public Iteration, Uncopyable + class IterationType : public Iteration, public Uncopyable { public: explicit IterationType (Functor const& f) : m_f (f) @@ -172,7 +172,7 @@ private: private: class LoopState : public AllocatedBy - , Uncopyable + , public Uncopyable { private: Iteration& m_iteration; diff --git a/modules/beast_basics/threads/beast_ReadWriteMutex.h b/modules/beast_basics/threads/beast_ReadWriteMutex.h index aea144a53..3ab273863 100644 --- a/modules/beast_basics/threads/beast_ReadWriteMutex.h +++ b/modules/beast_basics/threads/beast_ReadWriteMutex.h @@ -55,7 +55,7 @@ @ingroup beast_concurrent */ template -struct GenericScopedReadLock : Uncopyable +struct GenericScopedReadLock : public Uncopyable { inline explicit GenericScopedReadLock (LockType const& lock) noexcept : @@ -81,7 +81,7 @@ private: @ingroup beast_concurrent */ template -struct GenericScopedWriteLock : Uncopyable +struct GenericScopedWriteLock : public Uncopyable { inline explicit GenericScopedWriteLock (LockType const& lock) noexcept : diff --git a/modules/beast_basics/threads/beast_SerialFor.h b/modules/beast_basics/threads/beast_SerialFor.h index 5be1429af..538a7110c 100644 --- a/modules/beast_basics/threads/beast_SerialFor.h +++ b/modules/beast_basics/threads/beast_SerialFor.h @@ -31,7 +31,7 @@ @ingroup beast_core */ -class BEAST_API SerialFor : Uncopyable +class BEAST_API SerialFor : public Uncopyable { public: /** Create a serial for loop. diff --git a/modules/beast_basics/threads/beast_SharedData.h b/modules/beast_basics/threads/beast_SharedData.h index f02649e4c..3afc5b123 100644 --- a/modules/beast_basics/threads/beast_SharedData.h +++ b/modules/beast_basics/threads/beast_SharedData.h @@ -113,7 +113,7 @@ See @ref CallQueue::queue(). */ template -class SharedData : Uncopyable +class SharedData : public Uncopyable { public: class ReadAccess; @@ -176,7 +176,7 @@ private: Use sparingly. */ template -class SharedData ::UnlockedAccess : Uncopyable +class SharedData ::UnlockedAccess : public Uncopyable { public: explicit UnlockedAccess (SharedData const& state) @@ -205,7 +205,7 @@ private: /** Read only access to a SharedData */ template -class SharedData ::ReadAccess : Uncopyable +class SharedData ::ReadAccess : public Uncopyable { public: /** Create a ReadAccess from the specified SharedData */ @@ -242,7 +242,7 @@ private: /** Read/write access to a SharedData */ template -class SharedData ::WriteAccess : Uncopyable +class SharedData ::WriteAccess : public Uncopyable { public: explicit WriteAccess (SharedData& state) diff --git a/modules/beast_core/containers/beast_AbstractFifo.h b/modules/beast_core/containers/beast_AbstractFifo.h index f0fe0e571..f90fea25f 100644 --- a/modules/beast_core/containers/beast_AbstractFifo.h +++ b/modules/beast_core/containers/beast_AbstractFifo.h @@ -81,7 +81,7 @@ }; @endcode */ -class BEAST_API AbstractFifo : LeakChecked , Uncopyable +class BEAST_API AbstractFifo : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/containers/beast_HashMap.h b/modules/beast_core/containers/beast_HashMap.h index 981a00425..6438bb354 100644 --- a/modules/beast_core/containers/beast_HashMap.h +++ b/modules/beast_core/containers/beast_HashMap.h @@ -126,7 +126,7 @@ template class HashMap - : Uncopyable + : public Uncopyable , LeakChecked , Uncopyable + class Iterator : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/containers/beast_LinkedListPointer.h b/modules/beast_core/containers/beast_LinkedListPointer.h index da6785669..4d04ebe49 100644 --- a/modules/beast_core/containers/beast_LinkedListPointer.h +++ b/modules/beast_core/containers/beast_LinkedListPointer.h @@ -53,7 +53,7 @@ @endcode */ template -class LinkedListPointer : Uncopyable +class LinkedListPointer : public Uncopyable { public: //============================================================================== @@ -330,7 +330,7 @@ public: list, and then repeatedly call Appender::append() to add items to the end of the list in O(1) time. */ - class Appender : Uncopyable + class Appender : public Uncopyable { public: /** Creates an appender which will add items to the given list. diff --git a/modules/beast_core/containers/beast_List.h b/modules/beast_core/containers/beast_List.h index 3d352d05e..c187579b9 100644 --- a/modules/beast_core/containers/beast_List.h +++ b/modules/beast_core/containers/beast_List.h @@ -304,7 +304,7 @@ struct ListDefaultTag; @ingroup beast_core intrusive */ template -class List : Uncopyable +class List : public Uncopyable { public: typedef int size_type; @@ -323,7 +323,7 @@ public: } }; - class Node : Uncopyable + class Node : public Uncopyable { public: Node () { } diff --git a/modules/beast_core/containers/beast_LockFreeQueue.h b/modules/beast_core/containers/beast_LockFreeQueue.h index e64649b1e..64b83065b 100644 --- a/modules/beast_core/containers/beast_LockFreeQueue.h +++ b/modules/beast_core/containers/beast_LockFreeQueue.h @@ -50,7 +50,7 @@ template class LockFreeQueue { public: - class Node : Uncopyable + class Node : public Uncopyable { public: Node () { } diff --git a/modules/beast_core/containers/beast_LockFreeStack.h b/modules/beast_core/containers/beast_LockFreeStack.h index d32a47e38..c4b24739f 100644 --- a/modules/beast_core/containers/beast_LockFreeStack.h +++ b/modules/beast_core/containers/beast_LockFreeStack.h @@ -39,10 +39,10 @@ struct LockFreeStackDefaultTag; @ingroup beast_core intrusive */ template -class LockFreeStack : Uncopyable +class LockFreeStack : public Uncopyable { public: - class Node : Uncopyable + class Node : public Uncopyable { public: Node () diff --git a/modules/beast_core/containers/beast_OwnedArray.h b/modules/beast_core/containers/beast_OwnedArray.h index 9049bf010..684a253d8 100644 --- a/modules/beast_core/containers/beast_OwnedArray.h +++ b/modules/beast_core/containers/beast_OwnedArray.h @@ -48,7 +48,7 @@ template > - , Uncopyable + , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/containers/beast_ScopedValueSetter.h b/modules/beast_core/containers/beast_ScopedValueSetter.h index 3709d6e72..840dbd804 100644 --- a/modules/beast_core/containers/beast_ScopedValueSetter.h +++ b/modules/beast_core/containers/beast_ScopedValueSetter.h @@ -52,7 +52,7 @@ */ template -class ScopedValueSetter : Uncopyable +class ScopedValueSetter : public Uncopyable { public: /** Creates a ScopedValueSetter that will immediately change the specified value to the diff --git a/modules/beast_core/diagnostic/beast_FatalError.h b/modules/beast_core/diagnostic/beast_FatalError.h index 6086757bf..4821b2b26 100644 --- a/modules/beast_core/diagnostic/beast_FatalError.h +++ b/modules/beast_core/diagnostic/beast_FatalError.h @@ -31,7 +31,7 @@ the process is terminated, a listener object gets notified so that the client application can perform logging or emit further diagnostics. */ -class FatalError : Uncopyable +class FatalError : public Uncopyable { public: struct Reporter diff --git a/modules/beast_core/diagnostic/beast_ProtectedCall.cpp b/modules/beast_core/diagnostic/beast_ProtectedCall.cpp index ae23396c4..0227a3c2a 100644 --- a/modules/beast_core/diagnostic/beast_ProtectedCall.cpp +++ b/modules/beast_core/diagnostic/beast_ProtectedCall.cpp @@ -38,7 +38,7 @@ namespace // While this object is in scope, any Windows SEH // exceptions will be caught and re-thrown as an Error object. // -class ScopedPlatformExceptionCatcher : Uncopyable +class ScopedPlatformExceptionCatcher : public Uncopyable { public: ScopedPlatformExceptionCatcher () diff --git a/modules/beast_core/diagnostic/beast_UnitTest.h b/modules/beast_core/diagnostic/beast_UnitTest.h index 9af564b80..546bd43a6 100644 --- a/modules/beast_core/diagnostic/beast_UnitTest.h +++ b/modules/beast_core/diagnostic/beast_UnitTest.h @@ -331,7 +331,7 @@ private: @see UnitTest */ -class BEAST_API UnitTests : Uncopyable +class BEAST_API UnitTests : public Uncopyable { public: struct Results diff --git a/modules/beast_core/diagnostic/beast_UnitTestUtilities.h b/modules/beast_core/diagnostic/beast_UnitTestUtilities.h index 234e7ac09..6f8234b48 100644 --- a/modules/beast_core/diagnostic/beast_UnitTestUtilities.h +++ b/modules/beast_core/diagnostic/beast_UnitTestUtilities.h @@ -109,7 +109,7 @@ public: @see UnitTest, UnitTests */ -class JUnitXMLFormatter : Uncopyable +class JUnitXMLFormatter : public Uncopyable { public: JUnitXMLFormatter (UnitTests const& tests); diff --git a/modules/beast_core/files/beast_DirectoryIterator.h b/modules/beast_core/files/beast_DirectoryIterator.h index 144dca788..80a5bd6ff 100644 --- a/modules/beast_core/files/beast_DirectoryIterator.h +++ b/modules/beast_core/files/beast_DirectoryIterator.h @@ -41,7 +41,7 @@ It can also guess how far it's got using a wildly inaccurate algorithm. */ -class BEAST_API DirectoryIterator : LeakChecked , Uncopyable +class BEAST_API DirectoryIterator : LeakChecked , public Uncopyable { public: //============================================================================== @@ -116,7 +116,7 @@ public: private: //============================================================================== - class NativeIterator : LeakChecked , Uncopyable + class NativeIterator : LeakChecked , public Uncopyable { public: NativeIterator (const File& directory, const String& wildCard); diff --git a/modules/beast_core/files/beast_MemoryMappedFile.h b/modules/beast_core/files/beast_MemoryMappedFile.h index 56b657914..98b3f6192 100644 --- a/modules/beast_core/files/beast_MemoryMappedFile.h +++ b/modules/beast_core/files/beast_MemoryMappedFile.h @@ -30,7 +30,7 @@ /** Maps a file into virtual memory for easy reading and/or writing. */ -class BEAST_API MemoryMappedFile : LeakChecked , Uncopyable +class BEAST_API MemoryMappedFile : LeakChecked , public Uncopyable { public: /** The read/write flags used when opening a memory mapped file. */ diff --git a/modules/beast_core/files/beast_RandomAccessFile.h b/modules/beast_core/files/beast_RandomAccessFile.h index 2b7c9505c..e17d6cace 100644 --- a/modules/beast_core/files/beast_RandomAccessFile.h +++ b/modules/beast_core/files/beast_RandomAccessFile.h @@ -38,7 +38,7 @@ @see FileInputStream, FileOutputStream */ -class BEAST_API RandomAccessFile : Uncopyable, LeakChecked +class BEAST_API RandomAccessFile : public Uncopyable, LeakChecked { public: /** The type of an FileOffset. diff --git a/modules/beast_core/files/beast_TemporaryFile.h b/modules/beast_core/files/beast_TemporaryFile.h index b46371b48..62e8dd230 100644 --- a/modules/beast_core/files/beast_TemporaryFile.h +++ b/modules/beast_core/files/beast_TemporaryFile.h @@ -65,7 +65,7 @@ @see File, FileOutputStream */ -class BEAST_API TemporaryFile : LeakChecked , Uncopyable +class BEAST_API TemporaryFile : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/logging/beast_FileLogger.h b/modules/beast_core/logging/beast_FileLogger.h index d6cb1c602..564779967 100644 --- a/modules/beast_core/logging/beast_FileLogger.h +++ b/modules/beast_core/logging/beast_FileLogger.h @@ -38,7 +38,7 @@ class BEAST_API FileLogger : public Logger , LeakChecked - , Uncopyable + , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/maths/beast_Expression.cpp b/modules/beast_core/maths/beast_Expression.cpp index 455833363..ecd363020 100644 --- a/modules/beast_core/maths/beast_Expression.cpp +++ b/modules/beast_core/maths/beast_Expression.cpp @@ -346,7 +346,7 @@ struct Expression::Helpers //============================================================================== class EvaluationVisitor : public Scope::Visitor - , Uncopyable + , public Uncopyable { public: EvaluationVisitor (const TermPtr& t, const int recursion) @@ -361,7 +361,7 @@ struct Expression::Helpers class SymbolVisitingVisitor : public Scope::Visitor - , Uncopyable + , public Uncopyable { public: SymbolVisitingVisitor (const TermPtr& t, SymbolVisitor& v, const int recursion) @@ -377,7 +377,7 @@ struct Expression::Helpers class SymbolRenamingVisitor : public Scope::Visitor - , Uncopyable + , public Uncopyable { public: SymbolRenamingVisitor (const TermPtr& t, const Expression::Symbol& symbol_, const String& newName_, const int recursionCount_) @@ -607,7 +607,7 @@ struct Expression::Helpers //============================================================================== class SymbolCheckVisitor : public Term::SymbolVisitor - , Uncopyable + , public Uncopyable { public: SymbolCheckVisitor (const Symbol& symbol_) : wasFound (false), symbol (symbol_) {} @@ -622,7 +622,7 @@ struct Expression::Helpers //============================================================================== class SymbolListVisitor : public Term::SymbolVisitor - , Uncopyable + , public Uncopyable { public: SymbolListVisitor (Array& list_) : list (list_) {} @@ -633,7 +633,7 @@ struct Expression::Helpers }; //============================================================================== - class Parser : Uncopyable + class Parser : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/memory/beast_ByteOrder.h b/modules/beast_core/memory/beast_ByteOrder.h index b02eedf9d..57cf4816c 100644 --- a/modules/beast_core/memory/beast_ByteOrder.h +++ b/modules/beast_core/memory/beast_ByteOrder.h @@ -29,7 +29,7 @@ /** Contains static methods for converting the byte order between different endiannesses. */ -class BEAST_API ByteOrder : Uncopyable +class BEAST_API ByteOrder : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/memory/beast_HeapBlock.h b/modules/beast_core/memory/beast_HeapBlock.h index 074d3ecad..dfedcca93 100644 --- a/modules/beast_core/memory/beast_HeapBlock.h +++ b/modules/beast_core/memory/beast_HeapBlock.h @@ -82,7 +82,7 @@ namespace HeapBlockHelper @see Array, OwnedArray, MemoryBlock */ template -class HeapBlock : Uncopyable +class HeapBlock : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/memory/beast_Memory.h b/modules/beast_core/memory/beast_Memory.h index 092113cd7..cf87978c5 100644 --- a/modules/beast_core/memory/beast_Memory.h +++ b/modules/beast_core/memory/beast_Memory.h @@ -65,7 +65,7 @@ inline Type* createCopyIfNotNull (const Type* pointer) { return pointer != n /** A handy C++ wrapper that creates and deletes an NSAutoreleasePool object using RAII. You should use the BEAST_AUTORELEASEPOOL macro to create a local auto-release pool on the stack. */ - class BEAST_API ScopedAutoReleasePool : Uncopyable + class BEAST_API ScopedAutoReleasePool : public Uncopyable { public: ScopedAutoReleasePool(); diff --git a/modules/beast_core/memory/beast_ScopedPointer.h b/modules/beast_core/memory/beast_ScopedPointer.h index e0bb516d2..32d8aa832 100644 --- a/modules/beast_core/memory/beast_ScopedPointer.h +++ b/modules/beast_core/memory/beast_ScopedPointer.h @@ -62,7 +62,7 @@ you'd need to return a raw pointer (or use a std::auto_ptr instead). */ template -class ScopedPointer : Uncopyable +class ScopedPointer : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/memory/beast_SharedObject.h b/modules/beast_core/memory/beast_SharedObject.h index 2b5e46296..87f3d4b25 100644 --- a/modules/beast_core/memory/beast_SharedObject.h +++ b/modules/beast_core/memory/beast_SharedObject.h @@ -88,7 +88,6 @@ public: /** Returns the object's current reference count. */ inline int getReferenceCount() const noexcept { return refCount.get(); } - protected: //============================================================================== /** Creates the reference-counted object (with an initial ref count of zero). */ diff --git a/modules/beast_core/memory/beast_WeakReference.h b/modules/beast_core/memory/beast_WeakReference.h index 8c4334a9c..c96022618 100644 --- a/modules/beast_core/memory/beast_WeakReference.h +++ b/modules/beast_core/memory/beast_WeakReference.h @@ -130,7 +130,7 @@ public: */ class SharedPointer : public ReferenceCountingType - , Uncopyable + , public Uncopyable { public: explicit SharedPointer (ObjectType* const obj) noexcept : owner (obj) {} @@ -150,7 +150,7 @@ public: See the WeakReference class notes for an example of how to use this class. @see WeakReference */ - class Master : Uncopyable + class Master : public Uncopyable { public: Master() noexcept {} diff --git a/modules/beast_core/misc/beast_Main.h b/modules/beast_core/misc/beast_Main.h index 7a98c8579..f16711685 100644 --- a/modules/beast_core/misc/beast_Main.h +++ b/modules/beast_core/misc/beast_Main.h @@ -25,7 +25,7 @@ To use this, derive your class from @ref Main and implement the function run (); */ -class BEAST_API Main : Uncopyable +class BEAST_API Main : public Uncopyable { public: Main (); diff --git a/modules/beast_core/misc/beast_WindowsRegistry.h b/modules/beast_core/misc/beast_WindowsRegistry.h index 86b95cd24..5a62729fe 100644 --- a/modules/beast_core/misc/beast_WindowsRegistry.h +++ b/modules/beast_core/misc/beast_WindowsRegistry.h @@ -30,7 +30,7 @@ Contains some static helper functions for manipulating the MS Windows registry (Only available on Windows, of course!) */ -class WindowsRegistry : Uncopyable +class WindowsRegistry : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/native/beast_android_Files.cpp b/modules/beast_core/native/beast_android_Files.cpp index 5a6c56674..d5ca3facd 100644 --- a/modules/beast_core/native/beast_android_Files.cpp +++ b/modules/beast_core/native/beast_android_Files.cpp @@ -148,7 +148,7 @@ bool File::moveToTrash() const } //============================================================================== -class DirectoryIterator::NativeIterator::Pimpl : Uncopyable +class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable { public: Pimpl (const File& directory, const String& wildCard_) diff --git a/modules/beast_core/native/beast_android_JNIHelpers.h b/modules/beast_core/native/beast_android_JNIHelpers.h index 4393f17fa..68cc75b64 100644 --- a/modules/beast_core/native/beast_android_JNIHelpers.h +++ b/modules/beast_core/native/beast_android_JNIHelpers.h @@ -167,7 +167,7 @@ namespace } //============================================================================== -class JNIClassBase : Uncopyable +class JNIClassBase : public Uncopyable { public: explicit JNIClassBase (const char* classPath); diff --git a/modules/beast_core/native/beast_bsd_Files.cpp b/modules/beast_core/native/beast_bsd_Files.cpp index ec8bccdb6..dc6c2dd0a 100644 --- a/modules/beast_core/native/beast_bsd_Files.cpp +++ b/modules/beast_core/native/beast_bsd_Files.cpp @@ -241,7 +241,7 @@ bool File::moveToTrash() const } //============================================================================== -class DirectoryIterator::NativeIterator::Pimpl : Uncopyable +class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable { public: Pimpl (const File& directory, const String& wildCard_) diff --git a/modules/beast_core/native/beast_linux_Files.cpp b/modules/beast_core/native/beast_linux_Files.cpp index e29f551dc..d1253b92f 100644 --- a/modules/beast_core/native/beast_linux_Files.cpp +++ b/modules/beast_core/native/beast_linux_Files.cpp @@ -241,7 +241,7 @@ bool File::moveToTrash() const } //============================================================================== -class DirectoryIterator::NativeIterator::Pimpl : Uncopyable +class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable { public: Pimpl (const File& directory, const String& wildCard_) diff --git a/modules/beast_core/native/beast_mac_Files.mm b/modules/beast_core/native/beast_mac_Files.mm index 183492670..49115f75e 100644 --- a/modules/beast_core/native/beast_mac_Files.mm +++ b/modules/beast_core/native/beast_mac_Files.mm @@ -308,7 +308,7 @@ bool File::moveToTrash() const } //============================================================================== -class DirectoryIterator::NativeIterator::Pimpl : Uncopyable +class DirectoryIterator::NativeIterator::Pimpl : public Uncopyable { public: Pimpl (const File& directory, const String& wildCard_) diff --git a/modules/beast_core/native/beast_mac_Network.mm b/modules/beast_core/native/beast_mac_Network.mm index 8f3410185..c549b5d44 100644 --- a/modules/beast_core/native/beast_mac_Network.mm +++ b/modules/beast_core/native/beast_mac_Network.mm @@ -100,7 +100,7 @@ bool Process::openEmailWithAttachments (const String& targetEmailAddress, class URLConnectionState : public Thread , LeakChecked - , Uncopyable + , public Uncopyable { public: URLConnectionState (NSURLRequest* req) diff --git a/modules/beast_core/native/beast_osx_ObjCHelpers.h b/modules/beast_core/native/beast_osx_ObjCHelpers.h index 1f0c10e2e..f8cd9a679 100644 --- a/modules/beast_core/native/beast_osx_ObjCHelpers.h +++ b/modules/beast_core/native/beast_osx_ObjCHelpers.h @@ -64,7 +64,7 @@ struct NSObjectRetainer //============================================================================== template -struct ObjCClass : Uncopyable +struct ObjCClass : public Uncopyable { ObjCClass (const char* nameRoot) : cls (objc_allocateClassPair ([SuperclassType class], getRandomisedName (nameRoot).toUTF8(), 0)) diff --git a/modules/beast_core/native/beast_posix_NamedPipe.cpp b/modules/beast_core/native/beast_posix_NamedPipe.cpp index 07c2725d6..227dbc79e 100644 --- a/modules/beast_core/native/beast_posix_NamedPipe.cpp +++ b/modules/beast_core/native/beast_posix_NamedPipe.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -class NamedPipe::Pimpl : LeakChecked , Uncopyable +class NamedPipe::Pimpl : LeakChecked , public Uncopyable { public: Pimpl (const String& pipePath, bool createPipe) diff --git a/modules/beast_core/native/beast_posix_SharedCode.h b/modules/beast_core/native/beast_posix_SharedCode.h index fd9d28b97..b610dafeb 100644 --- a/modules/beast_core/native/beast_posix_SharedCode.h +++ b/modules/beast_core/native/beast_posix_SharedCode.h @@ -1169,7 +1169,7 @@ void* DynamicLibrary::getFunction (const String& functionName) noexcept //============================================================================== -class ChildProcess::ActiveProcess : LeakChecked , Uncopyable +class ChildProcess::ActiveProcess : LeakChecked , public Uncopyable { public: ActiveProcess (const StringArray& arguments) @@ -1298,7 +1298,7 @@ bool ChildProcess::kill() } //============================================================================== -struct HighResolutionTimer::Pimpl : Uncopyable +struct HighResolutionTimer::Pimpl : public Uncopyable { Pimpl (HighResolutionTimer& t) : owner (t), thread (0), shouldStop (false) { diff --git a/modules/beast_core/native/beast_win32_Files.cpp b/modules/beast_core/native/beast_win32_Files.cpp index 302ba9a96..228fe566a 100644 --- a/modules/beast_core/native/beast_win32_Files.cpp +++ b/modules/beast_core/native/beast_win32_Files.cpp @@ -786,7 +786,7 @@ bool File::createLink (const String& description, const File& linkFileToCreate) //============================================================================== class DirectoryIterator::NativeIterator::Pimpl : LeakChecked - , Uncopyable + , public Uncopyable { public: Pimpl (const File& directory, const String& wildCard) @@ -888,7 +888,7 @@ void File::revealToUser() const } //============================================================================== -class NamedPipe::Pimpl : LeakChecked , Uncopyable +class NamedPipe::Pimpl : LeakChecked , public Uncopyable { public: Pimpl (const String& pipeName, const bool createPipe) diff --git a/modules/beast_core/native/beast_win32_Registry.cpp b/modules/beast_core/native/beast_win32_Registry.cpp index af37aaa93..467323852 100644 --- a/modules/beast_core/native/beast_win32_Registry.cpp +++ b/modules/beast_core/native/beast_win32_Registry.cpp @@ -21,7 +21,7 @@ */ //============================================================================== -struct RegistryKeyWrapper : Uncopyable +struct RegistryKeyWrapper : public Uncopyable { RegistryKeyWrapper (String name, const bool createForWriting, const DWORD wow64Flags) : key (0), wideCharValueName (nullptr) diff --git a/modules/beast_core/native/beast_win32_Threads.cpp b/modules/beast_core/native/beast_win32_Threads.cpp index 52438b5e8..6e850d59a 100644 --- a/modules/beast_core/native/beast_win32_Threads.cpp +++ b/modules/beast_core/native/beast_win32_Threads.cpp @@ -461,7 +461,7 @@ void InterProcessLock::exit() } //============================================================================== -class ChildProcess::ActiveProcess : LeakChecked , Uncopyable +class ChildProcess::ActiveProcess : LeakChecked , public Uncopyable { public: ActiveProcess (const String& command) @@ -584,7 +584,7 @@ bool ChildProcess::kill() } //============================================================================== -struct HighResolutionTimer::Pimpl : Uncopyable +struct HighResolutionTimer::Pimpl : public Uncopyable { Pimpl (HighResolutionTimer& t) noexcept : owner (t), periodMs (0) { diff --git a/modules/beast_core/network/beast_NamedPipe.h b/modules/beast_core/network/beast_NamedPipe.h index 3e73e09ec..d1e04f1dc 100644 --- a/modules/beast_core/network/beast_NamedPipe.h +++ b/modules/beast_core/network/beast_NamedPipe.h @@ -34,7 +34,7 @@ @see InterprocessConnection */ -class BEAST_API NamedPipe : LeakChecked , Uncopyable +class BEAST_API NamedPipe : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/network/beast_Socket.h b/modules/beast_core/network/beast_Socket.h index 3b526f6f4..36e5e70f1 100644 --- a/modules/beast_core/network/beast_Socket.h +++ b/modules/beast_core/network/beast_Socket.h @@ -36,7 +36,7 @@ @see DatagramSocket, InterprocessConnection, InterprocessConnectionServer */ -class BEAST_API StreamingSocket : LeakChecked , Uncopyable +class BEAST_API StreamingSocket : LeakChecked , public Uncopyable { public: //============================================================================== @@ -175,7 +175,7 @@ private: @see StreamingSocket, InterprocessConnection, InterprocessConnectionServer */ -class BEAST_API DatagramSocket : LeakChecked , Uncopyable +class BEAST_API DatagramSocket : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/streams/beast_FileInputSource.h b/modules/beast_core/streams/beast_FileInputSource.h index ff217974c..9aa93275c 100644 --- a/modules/beast_core/streams/beast_FileInputSource.h +++ b/modules/beast_core/streams/beast_FileInputSource.h @@ -37,7 +37,7 @@ class BEAST_API FileInputSource : public InputSource , LeakChecked - , Uncopyable + , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/system/beast_SystemStats.h b/modules/beast_core/system/beast_SystemStats.h index 157561197..a8f7920f5 100644 --- a/modules/beast_core/system/beast_SystemStats.h +++ b/modules/beast_core/system/beast_SystemStats.h @@ -28,7 +28,7 @@ /** Contains methods for finding out about the current hardware and OS configuration. */ -class BEAST_API SystemStats : Uncopyable +class BEAST_API SystemStats : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ChildProcess.h b/modules/beast_core/threads/beast_ChildProcess.h index 9efead13b..ae6a38067 100644 --- a/modules/beast_core/threads/beast_ChildProcess.h +++ b/modules/beast_core/threads/beast_ChildProcess.h @@ -32,7 +32,7 @@ This class lets you launch an executable, and read its output. You can also use it to check whether the child process has finished. */ -class BEAST_API ChildProcess : LeakChecked , Uncopyable +class BEAST_API ChildProcess : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_CriticalSection.h b/modules/beast_core/threads/beast_CriticalSection.h index 28e053c79..45e8055cb 100644 --- a/modules/beast_core/threads/beast_CriticalSection.h +++ b/modules/beast_core/threads/beast_CriticalSection.h @@ -37,7 +37,7 @@ @see ScopedLock, ScopedTryLock, ScopedUnlock, SpinLock, ReadWriteLock, Thread, InterProcessLock */ -class BEAST_API CriticalSection : Uncopyable +class BEAST_API CriticalSection : public Uncopyable { public: //============================================================================== @@ -124,7 +124,7 @@ private: @see CriticalSection, Array, OwnedArray, SharedObjectArray */ -class BEAST_API DummyCriticalSection : Uncopyable +class BEAST_API DummyCriticalSection : public Uncopyable { public: inline DummyCriticalSection() noexcept {} diff --git a/modules/beast_core/threads/beast_DynamicLibrary.h b/modules/beast_core/threads/beast_DynamicLibrary.h index 0330163a9..2c29219e8 100644 --- a/modules/beast_core/threads/beast_DynamicLibrary.h +++ b/modules/beast_core/threads/beast_DynamicLibrary.h @@ -31,7 +31,7 @@ Since the DLL is freed when this object is deleted, it's handy for managing library lifetimes using RAII. */ -class BEAST_API DynamicLibrary : LeakChecked , Uncopyable +class BEAST_API DynamicLibrary : LeakChecked , public Uncopyable { public: /** Creates an unopened DynamicLibrary object. diff --git a/modules/beast_core/threads/beast_HighResolutionTimer.h b/modules/beast_core/threads/beast_HighResolutionTimer.h index 01f38fdc2..cba759abf 100644 --- a/modules/beast_core/threads/beast_HighResolutionTimer.h +++ b/modules/beast_core/threads/beast_HighResolutionTimer.h @@ -38,7 +38,7 @@ @see Timer */ -class BEAST_API HighResolutionTimer : LeakChecked , Uncopyable +class BEAST_API HighResolutionTimer : LeakChecked , public Uncopyable { protected: /** Creates a HighResolutionTimer. diff --git a/modules/beast_core/threads/beast_InterProcessLock.h b/modules/beast_core/threads/beast_InterProcessLock.h index 7e4469f8c..43a83580f 100644 --- a/modules/beast_core/threads/beast_InterProcessLock.h +++ b/modules/beast_core/threads/beast_InterProcessLock.h @@ -34,7 +34,7 @@ @see CriticalSection */ -class BEAST_API InterProcessLock : Uncopyable +class BEAST_API InterProcessLock : public Uncopyable { public: //============================================================================== @@ -71,7 +71,7 @@ public: @see ScopedLock */ - class ScopedLockType : Uncopyable + class ScopedLockType : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_Process.h b/modules/beast_core/threads/beast_Process.h index 87b8262d8..d9a56804c 100644 --- a/modules/beast_core/threads/beast_Process.h +++ b/modules/beast_core/threads/beast_Process.h @@ -35,7 +35,7 @@ @see Thread, BEASTApplication */ -class BEAST_API Process : Uncopyable +class BEAST_API Process : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ReadWriteLock.h b/modules/beast_core/threads/beast_ReadWriteLock.h index 880cae41b..b5eb6ab9e 100644 --- a/modules/beast_core/threads/beast_ReadWriteLock.h +++ b/modules/beast_core/threads/beast_ReadWriteLock.h @@ -50,7 +50,7 @@ @see ScopedReadLock, ScopedWriteLock, CriticalSection */ -class BEAST_API ReadWriteLock : Uncopyable +class BEAST_API ReadWriteLock : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ScopedLock.h b/modules/beast_core/threads/beast_ScopedLock.h index 91cc5473d..5ba0960b1 100644 --- a/modules/beast_core/threads/beast_ScopedLock.h +++ b/modules/beast_core/threads/beast_ScopedLock.h @@ -51,7 +51,7 @@ @see GenericScopedUnlock, CriticalSection, SpinLock, ScopedLock, ScopedUnlock */ template -class GenericScopedLock : Uncopyable +class GenericScopedLock : public Uncopyable { public: //============================================================================== @@ -118,7 +118,7 @@ private: @see GenericScopedLock, CriticalSection, ScopedLock, ScopedUnlock */ template -class GenericScopedUnlock : Uncopyable +class GenericScopedUnlock : public Uncopyable { public: //============================================================================== @@ -186,7 +186,7 @@ private: @see CriticalSection::tryEnter, GenericScopedLock, GenericScopedUnlock */ template -class GenericScopedTryLock : Uncopyable +class GenericScopedTryLock : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ScopedReadLock.h b/modules/beast_core/threads/beast_ScopedReadLock.h index 9ec3c1ff5..1f5620c58 100644 --- a/modules/beast_core/threads/beast_ScopedReadLock.h +++ b/modules/beast_core/threads/beast_ScopedReadLock.h @@ -50,7 +50,7 @@ @see ReadWriteLock, ScopedWriteLock */ -class BEAST_API ScopedReadLock : Uncopyable +class BEAST_API ScopedReadLock : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ScopedWriteLock.h b/modules/beast_core/threads/beast_ScopedWriteLock.h index 8bc88ccbd..798d22522 100644 --- a/modules/beast_core/threads/beast_ScopedWriteLock.h +++ b/modules/beast_core/threads/beast_ScopedWriteLock.h @@ -50,7 +50,7 @@ @see ReadWriteLock, ScopedReadLock */ -class BEAST_API ScopedWriteLock : Uncopyable +class BEAST_API ScopedWriteLock : public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_SpinLock.h b/modules/beast_core/threads/beast_SpinLock.h index f8eec63a7..97b985740 100644 --- a/modules/beast_core/threads/beast_SpinLock.h +++ b/modules/beast_core/threads/beast_SpinLock.h @@ -40,7 +40,7 @@ @see CriticalSection */ -class BEAST_API SpinLock : Uncopyable +class BEAST_API SpinLock : public Uncopyable { public: inline SpinLock() noexcept {} diff --git a/modules/beast_core/threads/beast_Thread.h b/modules/beast_core/threads/beast_Thread.h index 90cb3f7f0..716a79c67 100644 --- a/modules/beast_core/threads/beast_Thread.h +++ b/modules/beast_core/threads/beast_Thread.h @@ -42,7 +42,7 @@ @see CriticalSection, WaitableEvent, Process, ThreadWithProgressWindow, MessageManagerLock */ -class BEAST_API Thread : LeakChecked , Uncopyable +class BEAST_API Thread : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_ThreadLocalValue.h b/modules/beast_core/threads/beast_ThreadLocalValue.h index e3aede01f..acd4ca64e 100644 --- a/modules/beast_core/threads/beast_ThreadLocalValue.h +++ b/modules/beast_core/threads/beast_ThreadLocalValue.h @@ -51,7 +51,7 @@ is deleted. */ template -class ThreadLocalValue : Uncopyable +class ThreadLocalValue : public Uncopyable { public: /** */ @@ -170,7 +170,7 @@ public: private: //============================================================================== #if BEAST_NO_COMPILER_THREAD_LOCAL - struct ObjectHolder : Uncopyable + struct ObjectHolder : public Uncopyable { ObjectHolder (const Thread::ThreadID& tid) : threadId (tid), object() diff --git a/modules/beast_core/threads/beast_ThreadPool.h b/modules/beast_core/threads/beast_ThreadPool.h index 81bc7a73b..79cc74f49 100644 --- a/modules/beast_core/threads/beast_ThreadPool.h +++ b/modules/beast_core/threads/beast_ThreadPool.h @@ -46,7 +46,7 @@ class ThreadPoolThread; @see ThreadPool, Thread */ -class BEAST_API ThreadPoolJob : LeakChecked , Uncopyable +class BEAST_API ThreadPoolJob : LeakChecked , public Uncopyable { public: //============================================================================== @@ -137,7 +137,7 @@ private: @see ThreadPoolJob, Thread */ -class BEAST_API ThreadPool : LeakChecked , Uncopyable +class BEAST_API ThreadPool : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/threads/beast_WaitableEvent.h b/modules/beast_core/threads/beast_WaitableEvent.h index 22e610481..ee71c2dc3 100644 --- a/modules/beast_core/threads/beast_WaitableEvent.h +++ b/modules/beast_core/threads/beast_WaitableEvent.h @@ -35,7 +35,7 @@ calling thread until another thread wakes it up by calling the signal() method. */ -class BEAST_API WaitableEvent : LeakChecked , Uncopyable +class BEAST_API WaitableEvent : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/xml/beast_XmlDocument.h b/modules/beast_core/xml/beast_XmlDocument.h index 3e51feeca..3f9a48d03 100644 --- a/modules/beast_core/xml/beast_XmlDocument.h +++ b/modules/beast_core/xml/beast_XmlDocument.h @@ -67,7 +67,7 @@ class InputSource; @see XmlElement */ -class BEAST_API XmlDocument : LeakChecked , Uncopyable +class BEAST_API XmlDocument : LeakChecked , public Uncopyable { public: //============================================================================== diff --git a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp b/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp index 6cb71be23..98cba6701 100644 --- a/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp +++ b/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp @@ -26,7 +26,7 @@ ============================================================================== */ -class GZIPCompressorOutputStream::GZIPCompressorHelper : Uncopyable +class GZIPCompressorOutputStream::GZIPCompressorHelper : public Uncopyable { public: GZIPCompressorHelper (const int compressionLevel, const int windowBits) diff --git a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp index 5f69fa68a..bc70e9b43 100644 --- a/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp +++ b/modules/beast_core/zip/beast_GZIPDecompressorInputStream.cpp @@ -82,7 +82,7 @@ namespace zlibNamespace //============================================================================== // internal helper object that holds the zlib structures so they don't have to be // included publicly. -class GZIPDecompressorInputStream::GZIPDecompressHelper : Uncopyable +class GZIPDecompressorInputStream::GZIPDecompressHelper : public Uncopyable { public: GZIPDecompressHelper (const bool dontWrap) diff --git a/modules/beast_core/zip/beast_ZipFile.cpp b/modules/beast_core/zip/beast_ZipFile.cpp index 7ace22e12..bc3c6f0b4 100644 --- a/modules/beast_core/zip/beast_ZipFile.cpp +++ b/modules/beast_core/zip/beast_ZipFile.cpp @@ -442,7 +442,7 @@ Result ZipFile::uncompressEntry (const int index, //============================================================================= extern unsigned long beast_crc32 (unsigned long crc, const unsigned char*, unsigned len); -class ZipFile::Builder::Item : LeakChecked , Uncopyable +class ZipFile::Builder::Item : LeakChecked , public Uncopyable { public: Item (const File& f, const int compression, const String& storedPath) diff --git a/modules/beast_core/zip/beast_ZipFile.h b/modules/beast_core/zip/beast_ZipFile.h index d137d3fef..c5ea0f84e 100644 --- a/modules/beast_core/zip/beast_ZipFile.h +++ b/modules/beast_core/zip/beast_ZipFile.h @@ -42,7 +42,7 @@ This can enumerate the items in a ZIP file and can create suitable stream objects to read each one. */ -class BEAST_API ZipFile : LeakChecked , Uncopyable +class BEAST_API ZipFile : LeakChecked , public Uncopyable { public: /** Creates a ZipFile based for a file. */ @@ -184,7 +184,7 @@ public: Currently this just stores the files with no compression.. That will be added soon! */ - class Builder : LeakChecked , Uncopyable + class Builder : LeakChecked , public Uncopyable { public: Builder(); diff --git a/modules/beast_db/keyvalue/beast_KeyvaDB.cpp b/modules/beast_db/keyvalue/beast_KeyvaDB.cpp index 665a82a24..c067276a6 100644 --- a/modules/beast_db/keyvalue/beast_KeyvaDB.cpp +++ b/modules/beast_db/keyvalue/beast_KeyvaDB.cpp @@ -124,7 +124,7 @@ public: }; // Key records are indexed starting at one. - struct KeyRecord : Uncopyable + struct KeyRecord : public Uncopyable { explicit KeyRecord (void* const keyStorage) : key (keyStorage) @@ -153,7 +153,7 @@ public: // are identical to the format on disk. Therefore it is necessary to // use the serialization routines to extract or update the key records. // - class KeyBlock : Uncopyable + class KeyBlock : public Uncopyable { public: KeyBlock (int depth, int keyBytes) @@ -475,7 +475,7 @@ public: //-------------------------------------------------------------------------- - struct FindResult : Uncopyable + struct FindResult : public Uncopyable { FindResult (void* const keyStorage) : keyRecord (keyStorage) diff --git a/modules/beast_sqdb/api/transaction.h b/modules/beast_sqdb/api/transaction.h index 08775ab84..bca0ed048 100644 --- a/modules/beast_sqdb/api/transaction.h +++ b/modules/beast_sqdb/api/transaction.h @@ -63,7 +63,7 @@ namespace sqdb { -class transaction : Uncopyable +class transaction : public Uncopyable { public: explicit transaction(session& s); diff --git a/modules/beast_sqdb/detail/ref_counted_statement.h b/modules/beast_sqdb/detail/ref_counted_statement.h index 77b51ed15..ef068b146 100644 --- a/modules/beast_sqdb/detail/ref_counted_statement.h +++ b/modules/beast_sqdb/detail/ref_counted_statement.h @@ -67,7 +67,7 @@ namespace detail { // used for "once" and "prepare" -class ref_counted_statement_base : Uncopyable +class ref_counted_statement_base : public Uncopyable { public: ref_counted_statement_base(session& s); diff --git a/modules/beast_sqdb/detail/type_conversion.h b/modules/beast_sqdb/detail/type_conversion.h index ddf810edb..0f1ae18d9 100644 --- a/modules/beast_sqdb/detail/type_conversion.h +++ b/modules/beast_sqdb/detail/type_conversion.h @@ -78,7 +78,7 @@ template class conversion_into_type : private base_value_holder , public into_type ::base_type> - , Uncopyable + , public Uncopyable { public: typedef typename type_conversion::base_type BASE_TYPE; @@ -109,7 +109,7 @@ template class conversion_use_type : private base_value_holder , public use_type::base_type> - , Uncopyable + , public Uncopyable { public: typedef typename type_conversion::base_type BASE_TYPE;