Fixed include paths in project Common

13 files changed, 33 insertions, 29 deletions

diff --git a/Common/interface/AdaptiveFixedBlockAllocator.h b/Common/interface/AdaptiveFixedBlockAllocator.h
index 6fe821a3..8ca035c4 100644
--- a/Common/interface/AdaptiveFixedBlockAllocator.h
+++ b/Common/interface/AdaptiveFixedBlockAllocator.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
-#include "MemoryAllocator.h"
+#include "../../Primitives/interface/MemoryAllocator.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
 #include "FixedBlockMemoryAllocator.h"
-#include "DebugUtilities.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/BasicFileStream.h b/Common/interface/BasicFileStream.h
index e2807f11..198ff95e 100644
--- a/Common/interface/BasicFileStream.h
+++ b/Common/interface/BasicFileStream.h
@@ -26,11 +26,11 @@
 /// \file
 /// Implementation of the BasicFileStream class
 
-#include "FileStream.h"
+#include "../../Primitives/interface/FileStream.h"
+#include "../../Primitives/interface/DataBlob.h"
 #include "ObjectBase.h"
 #include "RefCountedObjectImpl.h"
 #include "FileWrapper.h"
-#include "DataBlob.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/BasicMath.h b/Common/interface/BasicMath.h
index 02aaacfd..eae2dc8a 100644
--- a/Common/interface/BasicMath.h
+++ b/Common/interface/BasicMath.h
@@ -21,22 +21,20 @@
  *  of the possibility of such damages.
  */
 
-//// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-//// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-//// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-//// PARTICULAR PURPOSE.
-////
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
 #pragma once
 
-#include "DebugUtilities.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
 
 #define _USE_MATH_DEFINES
 #include <math.h>
 
 #include "HashUtils.h"
 
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable : 4201) // nonstandard extension used: nameless struct/union
+#endif
+
 // Common Constants
 
 #define PI_F 3.1415927f
@@ -1503,3 +1501,7 @@ namespace std
         }
     };
 }
+
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
diff --git a/Common/interface/DataBlobImpl.h b/Common/interface/DataBlobImpl.h
index 90ace50d..f4a506e4 100644
--- a/Common/interface/DataBlobImpl.h
+++ b/Common/interface/DataBlobImpl.h
@@ -26,10 +26,10 @@
 /// \file
 /// Implementation for the IDataBlob interface
 
-#include "BasicTypes.h"
-#include "ObjectBase.h"
-#include "DataBlob.h"
 #include <vector>
+#include "../../Primitives/interface/BasicTypes.h"
+#include "../../Primitives/interface/DataBlob.h"
+#include "ObjectBase.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/DefaultRawMemoryAllocator.h b/Common/interface/DefaultRawMemoryAllocator.h
index afb3fd59..888ff5ae 100644
--- a/Common/interface/DefaultRawMemoryAllocator.h
+++ b/Common/interface/DefaultRawMemoryAllocator.h
@@ -26,7 +26,7 @@
 /// \file
 /// Defines Diligent::DefaultRawMemoryAllocator class
 
-#include "MemoryAllocator.h"
+#include "../../Primitives/interface/MemoryAllocator.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/FileWrapper.h b/Common/interface/FileWrapper.h
index 6eeae557..cd06b898 100644
--- a/Common/interface/FileWrapper.h
+++ b/Common/interface/FileWrapper.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
-#include "FileSystem.h"
-#include "Errors.h"
-#include "DebugUtilities.h"
+#include "../../Platforms/Basic/interface/Errors.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../Platforms/interface/FileSystem.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/FixedBlockMemoryAllocator.h b/Common/interface/FixedBlockMemoryAllocator.h
index 1affd8b6..e1a25c35 100644
--- a/Common/interface/FixedBlockMemoryAllocator.h
+++ b/Common/interface/FixedBlockMemoryAllocator.h
@@ -30,9 +30,9 @@
 #include <mutex>
 #include <unordered_set>
 #include <vector>
-#include "MemoryAllocator.h"
+#include "../../Platforms/Basic/interface/Errors.h"
+#include "../../Primitives/interface/MemoryAllocator.h"
 #include "STDAllocator.h"
-#include "Errors.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/HashUtils.h b/Common/interface/HashUtils.h
index 6ad68160..dff1b033 100644
--- a/Common/interface/HashUtils.h
+++ b/Common/interface/HashUtils.h
@@ -26,7 +26,8 @@
 #include <functional>
 #include <memory>
 
-#include "Errors.h"
+#include "../../Platforms/Basic/interface/Errors.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
 
 #define LOG_HASH_CONFLICTS 1
 
diff --git a/Common/interface/LockHelper.h b/Common/interface/LockHelper.h
index dc8f290d..b96b92ec 100644
--- a/Common/interface/LockHelper.h
+++ b/Common/interface/LockHelper.h
@@ -29,6 +29,7 @@
 #include <atomic>
 
 #include "../../Platforms/interface/Atomics.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
 
 namespace ThreadingTools
 {
diff --git a/Common/interface/ObjectBase.h b/Common/interface/ObjectBase.h
index 2c0e29a5..360e645c 100644
--- a/Common/interface/ObjectBase.h
+++ b/Common/interface/ObjectBase.h
@@ -26,7 +26,7 @@
 /// \file
 /// Implementation of the Diligent::ObjectBase template class
 
-#include "Object.h"
+#include "../../Primitives/interface/Object.h"
 #include "RefCountedObjectImpl.h"
 
 namespace Diligent
diff --git a/Common/interface/STDAllocator.h b/Common/interface/STDAllocator.h
index d77620bc..ecc18e1e 100644
--- a/Common/interface/STDAllocator.h
+++ b/Common/interface/STDAllocator.h
@@ -27,9 +27,9 @@
 /// Defines Diligent::DefaultRawMemoryAllocator class
 #include <limits>
 
-#include "BasicTypes.h"
-#include "MemoryAllocator.h"
-#include "DebugUtilities.h"
+#include "../../Primitives/interface/BasicTypes.h"
+#include "../../Primitives/interface/MemoryAllocator.h"
+#include "../../Platforms/Basic/interface/DebugUtilities.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/StringDataBlobImpl.h b/Common/interface/StringDataBlobImpl.h
index fdbd6762..62dcb90a 100644
--- a/Common/interface/StringDataBlobImpl.h
+++ b/Common/interface/StringDataBlobImpl.h
@@ -26,8 +26,8 @@
 /// \file
 /// Implementation for the IDataBlob interface
 
-#include "DataBlob.h"
-#include "BasicTypes.h"
+#include "../../Primitives/interface/BasicTypes.h"
+#include "../../Primitives/interface/DataBlob.h"
 #include "ObjectBase.h"
 #include <vector>
 
diff --git a/Common/interface/UniqueIdentifier.h b/Common/interface/UniqueIdentifier.h
index e296d2e9..12b2928e 100644
--- a/Common/interface/UniqueIdentifier.h
+++ b/Common/interface/UniqueIdentifier.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "Atomics.h"
+#include "../../Platforms/interface/Atomics.h"
 
 namespace Diligent
 {