fix horrible circular references and self namespace nesting

Author: devshgraphicsprogramming

include/nbl/system/CFileViewVirtualAllocatorPOSIX.h

@@ -1,21 +1,16 @@
 #ifndef _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED_
 #define _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_POSIX_H_INCLUDED_
 
-
-#include "nbl/system/IFileViewAllocator.h"
-
-
-#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
-namespace nbl::system 
+namespace nbl::system
 {
-
+#if defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
 class CFileViewVirtualAllocatorPOSIX : public IFileViewAllocator
 {
 	public:
 		void* alloc(size_t size) override;
 		bool dealloc(void* data, size_t size) override;
 };
-
-}
 #endif
+}
+
 #endif

include/nbl/system/CFileViewVirtualAllocatorWin32.h

@@ -1,10 +1,6 @@
 #ifndef _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED_
 #define _NBL_SYSTEM_C_FILE_VIEW_VIRTUAL_ALLOCATOR_WIN32_H_INCLUDED_
 
-
-#include "nbl/system/IFileViewAllocator.h"
-
-
 namespace nbl::system 
 {
 #ifdef _NBL_PLATFORM_WINDOWS_

include/nbl/system/IFileViewAllocator.h

@@ -1,23 +1,25 @@
 #ifndef _NBL_SYSTEM_I_FILE_ALLOCATOR_H_INCLUDED_
 #define _NBL_SYSTEM_I_FILE_ALLOCATOR_H_INCLUDED_
 
+#include "nbl/core/declarations.h"
+
 #include <cstdint>
 #include <cstdlib>
 
 namespace nbl::system
 {
 
-	// This interface class provides the callbacks for `CFileView` which creates a mapped file over some memory
-	class IFileViewAllocator
-	{
+// This interface class provides the callbacks for `CFileView` which creates a mapped file over some memory
+class IFileViewAllocator
+{
 	public:
 		virtual void* alloc(size_t size) = 0;
 		virtual bool dealloc(void* data, size_t size) = 0;
-	};
+};
 
-	// Regular old file in RAM
-	class CPlainHeapAllocator : public IFileViewAllocator
-	{
+// Regular old file in RAM
+class CPlainHeapAllocator : public IFileViewAllocator
+{
 	public:
 		void* alloc(size_t size) override
 		{
@@ -28,12 +30,12 @@ namespace nbl::system
 			free(data);
 			return true;
 		}
-	};
+};
 
-	// This allocator is useful to create an `IFile` over memory that already contains something or is owned by some other component
-	// e.g. memory mapped IGPUBuffer, string_view or a string, or buffers handed out by other APIs
-	class CNullAllocator : public IFileViewAllocator
-	{
+// This allocator is useful to create an `IFile` over memory that already contains something or is owned by some other component
+// e.g. memory mapped IGPUBuffer, string_view or a string, or buffers handed out by other APIs
+class CNullAllocator : public IFileViewAllocator
+{
 	public:
 		void* alloc(size_t size) override
 		{
@@ -43,17 +45,18 @@ namespace nbl::system
 		{
 			return true;
 		}
-	};
+};
+
+}
 
 #ifdef _NBL_PLATFORM_WINDOWS_
-#include <nbl/system/CFileViewVirtualAllocatorWin32.h>
-	using VirtualMemoryAllocator = CFileViewVirtualAllocatorWin32;
+#include "nbl/system/CFileViewVirtualAllocatorWin32.h"
+	using VirtualMemoryAllocator = nbl::system::CFileViewVirtualAllocatorWin32;
 #elif defined(_NBL_PLATFORM_LINUX_) || defined(_NBL_PLATFORM_ANDROID_)
-#include <nbl/system/CFileViewVirtualAllocatorPOSIX.h>
-	using VirtualMemoryAllocator = CFileViewVirtualAllocatorPOSIX;
+#include "nbl/system/CFileViewVirtualAllocatorPOSIX.h"
+	using VirtualMemoryAllocator = nbl::system::CFileViewVirtualAllocatorPOSIX;
 #else
 #error "Unsupported platform!"
 #endif
-}
 
 #endif

src/nbl/system/CFileViewVirtualAllocatorPOSIX.cpp

@@ -1,4 +1,4 @@
-#include "nbl/system/CFileViewVirtualAllocatorPOSIX.h"
+#include "nbl/system/IFileViewAllocator.h"
 
 using namespace nbl::system;
 

src/nbl/system/CFileViewVirtualAllocatorWin32.cpp

@@ -1,4 +1,4 @@
-#include "nbl/system/CFileViewVirtualAllocatorWin32.h"
+#include "nbl/system/IFileViewAllocator.h"
 
 using namespace nbl::system;