diff options
Diffstat (limited to 'Common/interface')
| -rw-r--r-- | Common/interface/LockHelper.h | 2 | ||||
| -rw-r--r-- | Common/interface/RefCntAutoPtr.h | 7 | ||||
| -rw-r--r-- | Common/interface/RefCountedObjectImpl.h | 8 | ||||
| -rw-r--r-- | Common/interface/StringTools.h | 3 | ||||
| -rw-r--r-- | Common/interface/ValidatedCast.h | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/Common/interface/LockHelper.h b/Common/interface/LockHelper.h index 85f69082..bcb644df 100644 --- a/Common/interface/LockHelper.h +++ b/Common/interface/LockHelper.h @@ -28,7 +28,7 @@ #include <condition_variable> #include <atomic> -#include "Atomics.h" +#include "../../../Platforms/interface/Atomics.h" namespace ThreadingTools { diff --git a/Common/interface/RefCntAutoPtr.h b/Common/interface/RefCntAutoPtr.h index 496ee28e..f5d1a437 100644 --- a/Common/interface/RefCntAutoPtr.h +++ b/Common/interface/RefCntAutoPtr.h @@ -23,12 +23,13 @@ #pragma once -#include "DebugUtilities.h" +#include "../../../Primitives/interface/Object.h" +#include "../../../Platforms/Basic/interface/DebugUtilities.h" +#include "../../../Platforms/interface/Atomics.h" #include "LockHelper.h" -#include "Atomics.h" #include "ValidatedCast.h" #include "RefCountedObjectImpl.h" -#include "Object.h" + namespace Diligent { diff --git a/Common/interface/RefCountedObjectImpl.h b/Common/interface/RefCountedObjectImpl.h index 0f4a41c9..617eef59 100644 --- a/Common/interface/RefCountedObjectImpl.h +++ b/Common/interface/RefCountedObjectImpl.h @@ -26,12 +26,12 @@ /// \file /// Implementation of the template base class for reference counting objects -#include "Object.h" -#include "Atomics.h" -#include "DebugUtilities.h" +#include "../../../Primitives/interface/Object.h" +#include "../../../Primitives/interface/MemoryAllocator.h" +#include "../../../Platforms/interface/Atomics.h" +#include "../../../Platforms/Basic/interface/DebugUtilities.h" #include "LockHelper.h" #include "ValidatedCast.h" -#include "MemoryAllocator.h" namespace Diligent { diff --git a/Common/interface/StringTools.h b/Common/interface/StringTools.h index 0a43f1c8..5921411b 100644 --- a/Common/interface/StringTools.h +++ b/Common/interface/StringTools.h @@ -29,7 +29,8 @@ #include <algorithm> #include <cctype> #include <string.h> -#include "DebugUtilities.h" + +#include "../../../Platforms/Basic/interface/DebugUtilities.h" namespace Diligent { diff --git a/Common/interface/ValidatedCast.h b/Common/interface/ValidatedCast.h index 786f90a5..8848b920 100644 --- a/Common/interface/ValidatedCast.h +++ b/Common/interface/ValidatedCast.h @@ -23,7 +23,7 @@ #pragma once -#include "DebugUtilities.h" +#include "../../../Platforms/Basic/interface/DebugUtilities.h" template<typename DstType, typename SrcType> DstType* ValidatedCast( SrcType *Ptr ) |