From 68db615cd5f5ef731ca7018b251b43106c5a9f47 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Thu, 16 Nov 2017 19:38:10 -0800
Subject: Fixed Android build issues

---
 Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h | 4 ++--
 Graphics/GraphicsTools/src/GraphicsUtilities.cpp                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Graphics/GraphicsTools')

diff --git a/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h b/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h
index 17381758..8285125b 100644
--- a/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h
+++ b/Graphics/GraphicsTools/include/VariableSizeAllocationsManager.h
@@ -68,7 +68,7 @@ namespace Diligent
             std::map<OffsetType,    
                      FreeBlockInfo, 
                      std::less<OffsetType>, // Standard ordering
-                     STDAllocatorRawMem<std::pair<OffsetType,  FreeBlockInfo>> // Raw memory allocator
+                     STDAllocatorRawMem<std::pair<const OffsetType,  FreeBlockInfo>> // Raw memory allocator
                      >;
 
         // Type of the map that keeps memory blocks sorted by their sizes
@@ -76,7 +76,7 @@ namespace Diligent
             std::multimap<OffsetType, 
                           TFreeBlocksByOffsetMap::iterator, 
                           std::less<OffsetType>, // Standard ordering
-                          STDAllocatorRawMem<std::pair<OffsetType, TFreeBlocksByOffsetMap::iterator>> // Raw memory allocator
+                          STDAllocatorRawMem<std::pair<const OffsetType, TFreeBlocksByOffsetMap::iterator>> // Raw memory allocator
                           >;
 
         struct FreeBlockInfo
diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
index 9b5beb4f..23089571 100644
--- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
+++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
@@ -26,6 +26,7 @@
 #include "DebugUtilities.h"
 #include <algorithm>
 #include <functional>
+#include <math.h>
 
 #define PI_F 3.1415926f
 
-- 
cgit v1.2.3