Fix a few compile errors to make sure it works with clang

Author: AnastaZIuk

examples_tests/06.MeshLoaders/main.cpp

@@ -13,6 +13,7 @@
 
 using namespace nbl;
 using namespace core;
+using namespace ui;
 /*
     Uncomment for more detailed logging
 */

include/nbl/asset/IAccelerationStructure.h

@@ -99,30 +99,34 @@ class IAccelerationStructure : public IDescriptor
 				std::memmove(this, &copy, sizeof(GeometryData));
 				return *this;
 			}
+			
+			struct Triangles
+			{
+				E_FORMAT		vertexFormat;
+				AddressType		vertexData;
+				uint64_t		vertexStride;
+				uint32_t		maxVertex;
+				E_INDEX_TYPE	indexType;
+				AddressType		indexData;
+				AddressType		transformData;
+			};
+			
+			struct AABBs
+			{
+				AddressType		data;
+				size_t			stride;
+			};
 
+			struct Instances
+			{
+				AddressType		data;
+			};
+			
 			union
 			{
-				struct Triangles
-				{
-					E_FORMAT		vertexFormat;
-					AddressType		vertexData;
-					uint64_t		vertexStride;
-					uint32_t		maxVertex;
-					E_INDEX_TYPE	indexType;
-					AddressType		indexData;
-					AddressType		transformData;
-				} triangles;
-
-				struct AABBs
-				{
-					AddressType		data;
-					size_t			stride;
-				} aabbs;
-
-				struct Instances
-				{
-					AddressType		data;
-				} instances;
+				Triangles triangles;
+				AABBs aabbs;
+				Instances instances;
 			};
 		};
 

include/nbl/core/SRange.h

@@ -9,6 +9,8 @@
 
 #include "stddef.h"
 #include <type_traits>
+#include <utility>
+#include <iterator>
 
 /*! \file SRange.h
 	\brief File containing SRange utility struct for C++11 range loops
@@ -36,10 +38,9 @@ struct SRange
 		template<class Q=ConstIteratorType>
 		inline typename std::enable_if<!std::is_same<Q,IteratorType>::value,ConstIteratorType>::type end() const { return m_end; }
 
-		_NBL_STATIC_INLINE_CONSTEXPR bool is_const = std::is_const<T>::value;
-		inline const T&			operator[](size_t ix) const noexcept { return begin()[ix]; }
-		template<typename U=T, typename = typename std::enable_if<!is_const>::type>
-		inline T&				operator[](size_t ix) noexcept { return begin()[ix]; }
+		inline const T&	operator[](size_t ix) const noexcept { return begin()[ix]; }
+		template<typename Q=T>
+        inline typename std::enable_if<!std::is_const_v<Q>,T&>::type operator[](size_t ix) noexcept { return begin()[ix]; }
 
 		inline size_t size() const {return std::distance(m_begin,m_end);}
 

include/nbl/core/containers/CMemoryPool.h

@@ -16,7 +16,7 @@ class CMemoryPool : public Uncopyable
 {
 public:
     using addr_allocator_type = AddressAllocator;
-    using allocator_type = std::conditional<isThreadSafe,
+    using allocator_type = typename std::conditional<isThreadSafe,
         SimpleBlockBasedAllocatorMT<AddressAllocator,DataAllocator, std::recursive_mutex, Args...>,
         SimpleBlockBasedAllocatorST<AddressAllocator,DataAllocator, Args...>>::type;
     using size_type = typename core::address_allocator_traits<addr_allocator_type>::size_type;

include/nbl/video/CVulkanConnection.h

@@ -2,6 +2,7 @@
 #define __NBL_C_VULKAN_CONNECTION_H_INCLUDED__
 
 #include "nbl/video/IAPIConnection.h"
+#include "nbl/video/debug/CVulkanDebugCallback.h"
 
 #if defined(_NBL_PLATFORM_WINDOWS_)
 #   include "nbl/ui/IWindowWin32.h"
@@ -11,8 +12,6 @@
 
 namespace nbl::video
 {
-class CVulkanDebugCallback;
-
 class CVulkanConnection final : public IAPIConnection
 {
 public: