Fixed windows/linux build warnings

3 files changed, 6 insertions, 37 deletions

diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
index 0bdae324..525ae9e5 100644
--- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
@@ -59,7 +59,6 @@ set(SRC
     src/CommandContext.cpp
     src/CommandListManager.cpp
     src/CommandQueueD3D12Impl.cpp
-    src/D3D12ResourceBase.cpp
     src/D3D12TypeConversions.cpp
     src/D3D12Utils.cpp
     src/DescriptorHeap.cpp
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h
index df0fe667..b15b19cb 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h
@@ -38,14 +38,14 @@ public:
         m_TransitioningState((D3D12_RESOURCE_STATES)-1)*/
     {}
 
-    D3D12_RESOURCE_STATES GetState()const{return m_UsageState;}
-    void SetState(D3D12_RESOURCE_STATES UsageState){m_UsageState = UsageState;}
-    bool CheckAllStates(D3D12_RESOURCE_STATES States)const{return (m_UsageState & States) == States;}
-    bool CheckAnyState(D3D12_RESOURCE_STATES States)const{return (m_UsageState & States) != 0;}
-    ID3D12Resource *GetD3D12Resource(){ return m_pd3d12Resource; }
+    D3D12_RESOURCE_STATES GetState() const                            {return m_UsageState;}
+    void                  SetState(D3D12_RESOURCE_STATES UsageState)  {m_UsageState = UsageState;}
+    bool                  CheckAllStates(D3D12_RESOURCE_STATES States)const { return (m_UsageState & States) == States; }
+    bool                  CheckAnyState(D3D12_RESOURCE_STATES States) const { return (m_UsageState & States) != 0;      }
+    ID3D12Resource*       GetD3D12Resource()                                { return m_pd3d12Resource; }
 
 protected:
-	D3D12_RESOURCE_STATES m_UsageState;
+	D3D12_RESOURCE_STATES   m_UsageState;
 	//D3D12_RESOURCE_STATES m_TransitioningState;
     CComPtr<ID3D12Resource> m_pd3d12Resource; ///< D3D12 buffer object
 };
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12ResourceBase.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12ResourceBase.cpp
deleted file mode 100644
index 46d0dfdb..00000000
--- a/Graphics/GraphicsEngineD3D12/src/D3D12ResourceBase.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*     Copyright 2015-2018 Egor Yusov
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- *  In no event and under no legal theory, whether in tort (including negligence), 
- *  contract, or otherwise, unless required by applicable law (such as deliberate 
- *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
- *  liable for any damages, including any direct, indirect, special, incidental, 
- *  or consequential damages of any character arising as a result of this License or 
- *  out of the use or inability to use the software (including but not limited to damages 
- *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
- *  all other commercial damages or losses), even if such Contributor has been advised 
- *  of the possibility of such damages.
- */
-
-#include "pch.h"
-#include "D3D12ResourceBase.h"
-
-namespace Diligent
-{
-
-}