Use LeakChecked throughout Beast

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
+class BEAST_API DirectoryIterator : LeakChecked <DirectoryIterator>, Uncopyable
 {
 public:
     //==============================================================================
@@ -116,7 +116,7 @@ public:
 
 private:
     //==============================================================================
-    class NativeIterator
+    class NativeIterator : LeakChecked <NativeIterator>, Uncopyable
     {
     public:
         NativeIterator (const File& directory, const String& wildCard);
@@ -132,8 +132,6 @@ private:
         friend class DirectoryIterator;
         friend class ScopedPointer<Pimpl>;
         ScopedPointer<Pimpl> pimpl;
-
-        BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NativeIterator)
     };
 
     friend class ScopedPointer<NativeIterator::Pimpl>;
@@ -147,8 +145,6 @@ private:
     bool hasBeenAdvanced;
     ScopedPointer <DirectoryIterator> subIterator;
     File currentFile;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectoryIterator)
 };
 
 #endif   // BEAST_DIRECTORYITERATOR_BEASTHEADER

modules/beast_core/files/beast_File.cpp

@@ -26,6 +26,15 @@ File::File (const String& fullPathName)
 {
 }
 
+File::File (const File& other)
+    : fullPath (other.fullPath)
+{
+}
+
+File::~File() noexcept
+{
+}
+
 File File::createFileWithoutCheckingPath (const String& path) noexcept
 {
     File f;
@@ -33,11 +42,6 @@ File File::createFileWithoutCheckingPath (const String& path) noexcept
     return f;
 }
 
-File::File (const File& other)
-    : fullPath (other.fullPath)
-{
-}
-
 File& File::operator= (const String& newPath)
 {
     fullPath = parseAbsolutePath (newPath);

modules/beast_core/files/beast_File.h

@@ -46,7 +46,7 @@ class FileOutputStream;
 
     @see FileInputStream, FileOutputStream
 */
-class BEAST_API File
+class BEAST_API File : LeakChecked <File>
 {
 public:
     //==============================================================================
@@ -76,7 +76,7 @@ public:
     File (const File& other);
 
     /** Destructor. */
-    ~File() noexcept  {}
+    ~File() noexcept;
 
     /** Sets the file based on an absolute pathname.
 
@@ -948,8 +948,6 @@ private:
     bool setFileTimesInternal (int64 m, int64 a, int64 c) const;
     void getFileTimesInternal (int64& m, int64& a, int64& c) const;
     bool setFileReadOnlyInternal (bool) const;
-
-    BEAST_LEAK_DETECTOR (File)
 };
 
 #endif   // BEAST_FILE_BEASTHEADER

modules/beast_core/files/beast_FileInputStream.h

@@ -34,7 +34,9 @@
 
     @see InputStream, FileOutputStream, File::createInputStream
 */
-class BEAST_API FileInputStream  : public InputStream
+class BEAST_API FileInputStream
+    : public InputStream
+    , LeakChecked <FileInputStream>
 {
 public:
     //==============================================================================
@@ -87,8 +89,6 @@ private:
     void openHandle();
     void closeHandle();
     size_t readInternal (void* buffer, size_t numBytes);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileInputStream)
 };
 
 #endif   // BEAST_FILEINPUTSTREAM_BEASTHEADER

modules/beast_core/files/beast_FileOutputStream.h

@@ -34,7 +34,9 @@
 
     @see OutputStream, FileInputStream, File::createOutputStream
 */
-class BEAST_API FileOutputStream  : public OutputStream
+class BEAST_API FileOutputStream
+    : public OutputStream
+    , LeakChecked <FileOutputStream>
 {
 public:
     //==============================================================================
@@ -107,8 +109,6 @@ private:
     bool flushBuffer();
     int64 setPositionInternal (int64);
     ssize_t writeInternal (const void*, size_t);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FileOutputStream)
 };
 
 #endif   // BEAST_FILEOUTPUTSTREAM_BEASTHEADER

modules/beast_core/files/beast_FileSearchPath.h

@@ -34,7 +34,7 @@
 
     @see File
 */
-class BEAST_API FileSearchPath
+class BEAST_API FileSearchPath : LeakChecked <FileSearchPath>
 {
 public:
     //==============================================================================
@@ -157,8 +157,6 @@ private:
     StringArray directories;
 
     void init (const String& path);
-
-    BEAST_LEAK_DETECTOR (FileSearchPath)
 };
 
 #endif   // BEAST_FILESEARCHPATH_BEASTHEADER

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
+class BEAST_API MemoryMappedFile : LeakChecked <MemoryMappedFile>, Uncopyable
 {
 public:
     /** The read/write flags used when opening a memory mapped file. */
@@ -103,8 +103,6 @@ private:
    #endif
 
     void openInternal (const File&, AccessMode);
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MemoryMappedFile)
 };
 
 

modules/beast_core/files/beast_TemporaryFile.h

@@ -65,7 +65,7 @@
 
     @see File, FileOutputStream
 */
-class BEAST_API TemporaryFile
+class BEAST_API TemporaryFile : LeakChecked <TemporaryFile>, Uncopyable
 {
 public:
     //==============================================================================
@@ -159,8 +159,6 @@ public:
 private:
     //==============================================================================
     const File temporaryFile, targetFile;
-
-    BEAST_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemporaryFile)
 };
 
 #endif   // BEAST_TEMPORARYFILE_BEASTHEADER