we have C++17 now, lets use it

devshgraphicsprogramming · devshgraphicsprogramming · commit fd866e0b674b · 2023-02-20T01:04:43.000+01:00
diff --git a/include/CObjectCache.h b/include/CObjectCache.h
@@ -113,7 +113,7 @@ namespace impl
         // typedefs for implementation only
         using ValueType_impl = typename PairType::second_type; // container's value_type is always instantiation of std::pair
         using KeyType_impl = typename PairType::first_type;
-        using NoPtrValueType_impl = typename std::remove_pointer<ValueType_impl>::type;
+        using NoPtrValueType_impl = std::remove_pointer_t<ValueType_impl>;
         //! If T is pointer type, then ImmutableValueType_impl is `const U*` where U is type received by dereferencing operation on variable of type T.
         //! Otherwise (T is not pointer type) ImmutableValueType_impl is `const T`.
         using ImmutableValueType_impl = 
diff --git a/include/nbl/core/math/glslFunctions.h b/include/nbl/core/math/glslFunctions.h
@@ -161,7 +161,7 @@ template<class T>
 NBL_FORCE_INLINE T sign(const T& a)
 {
 	auto isneg = a < T(0);
-	using bool_type = typename std::remove_reference<decltype(isneg)>::type;
+	using bool_type = std::remove_reference_t<decltype(isneg)>;
 	T half_sign = core::mix<T,bool_type>(T(1),T(-1),isneg);
 	auto iszero = a == T(0);
 	return core::mix<T,bool_type>(half_sign,T(0),iszero);
diff --git a/include/nbl/core/math/glslFunctions.tcc b/include/nbl/core/math/glslFunctions.tcc
@@ -27,7 +27,7 @@ template<typename T>
 NBL_FORCE_INLINE T abs(const T& a)
 {
 	auto isneg = a < T(0);
-	using bool_type = typename std::remove_reference<decltype(isneg)>::type;
+	using bool_type = std::remove_reference_t<decltype(isneg)>;
 	return core::mix<T,bool_type>(a,-a,isneg);
 }
 
@@ -189,7 +189,7 @@ NBL_FORCE_INLINE T min(const T& a, const T& b)
 {
 	T vb = T(b);
 	auto asmaller = a<vb;
-	using bool_type = typename std::remove_reference<decltype(asmaller)>::type;
+	using bool_type = std::remove_reference_t<decltype(asmaller)>;
 	return core::mix<T,bool_type>(vb,a,asmaller);
 }
 
@@ -225,7 +225,7 @@ NBL_FORCE_INLINE T max(const T& a, const T& b)
 {
 	T vb = T(b);
 	auto asmaller = a < vb;
-	using bool_type = typename std::remove_reference<decltype(asmaller)>::type;
+	using bool_type = std::remove_reference_t<decltype(asmaller)>;
 	return core::mix<T,bool_type>(a,vb,asmaller);
 }
 
diff --git a/include/nbl/core/memory/new_delete.h b/include/nbl/core/memory/new_delete.h
@@ -100,24 +100,24 @@ struct NBL_API AlignedWithAllocator
 
 //use these by default instead of new and delete, single object (non-array) new takes constructor parameters as va_args
 #define _NBL_NEW(_obj_type, ... )                               nbl::core::impl::AlignedWithAllocator<_obj_type,_NBL_DEFAULT_ALLOCATOR_METATYPE<_obj_type> >::VA_ARGS_comma_workaround(_NBL_DEFAULT_ALIGNMENT(_obj_type)).new_(__VA_ARGS__)
-#define _NBL_DELETE(_obj)                                       nbl::core::impl::AlignedWithAllocator<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type,_NBL_DEFAULT_ALLOCATOR_METATYPE<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type> >::delete_(_obj)
+#define _NBL_DELETE(_obj)                                       nbl::core::impl::AlignedWithAllocator<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,_NBL_DEFAULT_ALLOCATOR_METATYPE<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>> >::delete_(_obj)
 
 #define _NBL_NEW_ARRAY(_obj_type,count)                         nbl::core::impl::AlignedWithAllocator<_obj_type,_NBL_DEFAULT_ALLOCATOR_METATYPE<_obj_type> >::new_array(count,_NBL_DEFAULT_ALIGNMENT(_obj_type))
-#define _NBL_DELETE_ARRAY(_obj,count)                           nbl::core::impl::AlignedWithAllocator<typename std::remove_reference_t<typename std::remove_pointer_t<decltype(_obj)>>,_NBL_DEFAULT_ALLOCATOR_METATYPE<typename std::remove_reference_t<typename std::remove_pointer_t<decltype(_obj)>>> >::delete_array(_obj,count)
+#define _NBL_DELETE_ARRAY(_obj,count)                           nbl::core::impl::AlignedWithAllocator<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,_NBL_DEFAULT_ALLOCATOR_METATYPE<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>> >::delete_array(_obj,count)
 
 //! Extra Utility Macros for when you don't want to always have to deduce the alignment but want to use a specific allocator
 //#define _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(_obj_type,_allocator_type)     static_assert(std::is_same<_obj_type,_allocator_type::value_type>::value,"Wrong allocator value_type!")
 #define _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(_obj_type,_allocator_type)     static_assert(std::is_same<_obj_type,std::allocator_traits<_allocator_type >::value_type>::value,"Wrong allocator value_type!")
 
 #define _NBL_NEW_W_ALLOCATOR(_obj_type,_allocator, ... )        nbl::core::impl::AlignedWithAllocator<_obj_type,_NBL_DEFAULT_ALLOCATOR_METATYPE<_obj_type> >::VA_ARGS_comma_workaround(_NBL_DEFAULT_ALIGNMENT(_obj_type),_allocator).new_(__VA_ARGS__); \
                                                                     _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(_obj_type,decltype(_allocator))
-#define _NBL_DELETE_W_ALLOCATOR(_obj,_allocator)                nbl::core::impl::AlignedWithAllocator<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type,_NBL_DEFAULT_ALLOCATOR_METATYPE<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type> >::delete_(_obj,_allocator); \
-                                                                    _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type,decltype(_allocator))
+#define _NBL_DELETE_W_ALLOCATOR(_obj,_allocator)                nbl::core::impl::AlignedWithAllocator<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,_NBL_DEFAULT_ALLOCATOR_METATYPE<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>> >::delete_(_obj,_allocator); \
+                                                                    _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,decltype(_allocator))
 
 #define _NBL_NEW_ARRAY_W_ALLOCATOR(_obj_type,count,_allocator)  nbl::core::impl::AlignedWithAllocator<_obj_type,_NBL_DEFAULT_ALLOCATOR_METATYPE<_obj_type> >::new_array(count,_NBL_DEFAULT_ALIGNMENT(_obj_type),_allocator); \
                                                                     _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(_obj_type,decltype(_allocator))
-#define _NBL_DELETE_ARRAY_W_ALLOCATOR(_obj,count,_allocator)    nbl::core::impl::AlignedWithAllocator<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type,_NBL_DEFAULT_ALLOCATOR_METATYPE<typename std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type> >::delete_array(_obj,count,_allocator); \
-                                                                    _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(std::remove_reference<typename std::remove_pointer<decltype(_obj)>::type>::type,decltype(_allocator))
+#define _NBL_DELETE_ARRAY_W_ALLOCATOR(_obj,count,_allocator)    nbl::core::impl::AlignedWithAllocator<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,_NBL_DEFAULT_ALLOCATOR_METATYPE<std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>> >::delete_array(_obj,count,_allocator); \
+                                                                    _NBL_ASSERT_ALLOCATOR_VALUE_TYPE(std::remove_reference_t<std::remove_pointer_t<decltype(_obj)>>,decltype(_allocator))
 
 
 namespace nbl
diff --git a/include/nbl/video/alloc/SubAllocatedDataBuffer.h b/include/nbl/video/alloc/SubAllocatedDataBuffer.h
@@ -96,7 +96,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou
                     if (rangeData)
                     {
                         auto alloctr = sadbRef->getFunctorAllocator();
-                        alloctr.deallocate(reinterpret_cast<typename std::remove_pointer<decltype(alloctr)>::type::pointer>(rangeData),numAllocs);
+                        alloctr.deallocate(reinterpret_cast<std::remove_pointer_t<decltype(alloctr)>::pointer>(rangeData),numAllocs);
                     }
                 }
 
@@ -106,7 +106,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou
                     if (rangeData) // could swap the values instead
                     {
                         auto alloctr = sadbRef->getFunctorAllocator();
-                        alloctr.deallocate(reinterpret_cast<typename std::remove_pointer<decltype(alloctr)>::type::pointer>(rangeData),numAllocs);
+                        alloctr.deallocate(reinterpret_cast<std::remove_pointer_t<decltype(alloctr)>::pointer>(rangeData),numAllocs);
                     }
                     sadbRef    = other.sadbRef;
                     rangeData   = other.rangeData;
@@ -147,7 +147,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou
                 }
         };
         constexpr static bool UsingDefaultFunctor = std::is_same<CustomDeferredFreeFunctor,void>::value;
-        using DeferredFreeFunctor = typename std::conditional<UsingDefaultFunctor,DefaultDeferredFreeFunctor,CustomDeferredFreeFunctor>::type;
+        using DeferredFreeFunctor = std::conditional_t<UsingDefaultFunctor,DefaultDeferredFreeFunctor,CustomDeferredFreeFunctor>;
         GPUDeferredEventHandlerST<DeferredFreeFunctor> deferredFrees;
         core::allocator<std::tuple<size_type,size_type,void*> > functorAllocator; // TODO : CMemoryPool<RobustGeneralpurposeAllocator> a-la naughty do
     public:
diff --git a/src/nbl/asset/interchange/CGLTFLoader.cpp b/src/nbl/asset/interchange/CGLTFLoader.cpp
@@ -683,7 +683,7 @@ using namespace nbl::asset;
 
 						for (const auto& glTFprimitive : glTFMesh.primitives)
 						{
-							typedef std::remove_reference<decltype(glTFprimitive)>::type SGLTFPrimitive;
+							std::remove_reference_t<decltype(glTFprimitive)> SGLTFPrimitive;
 
 							auto cpuMeshBuffer = core::make_smart_refctd_ptr<ICPUMeshBuffer>();
 							cpuMeshBuffer->setPositionAttributeIx(SAttributes::POSITION_ATTRIBUTE_LAYOUT_ID);
@@ -710,7 +710,7 @@ using namespace nbl::asset;
 								const auto& globalOffsetInBufferBindingResource = glTFbufferView.byteOffset.has_value() ? glTFbufferView.byteOffset.value() : 0u;
 								const auto& relativeOffsetInBufferViewAttribute = glTFAccessor.byteOffset.has_value() ? glTFAccessor.byteOffset.value() : 0u;
 
-								typedef std::remove_reference<decltype(glTFbufferView)>::type SGLTFBufferView;
+								std::remove_reference_t<decltype(glTFbufferView)> SGLTFBufferView;
 
 								auto setBufferBinding = [&](uint32_t target) -> void
 								{

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ template<class T>`
`161`	`161`	`NBL_FORCE_INLINE T sign(const T& a)`
`162`	`162`	`{`
`163`	`163`	`auto isneg = a < T(0);`
`164`		`- using bool_type = typename std::remove_reference<decltype(isneg)>::type;`
	`164`	`+ using bool_type = std::remove_reference_t<decltype(isneg)>;`
`165`	`165`	`T half_sign = core::mix<T,bool_type>(T(1),T(-1),isneg);`
`166`	`166`	`auto iszero = a == T(0);`
`167`	`167`	`return core::mix<T,bool_type>(half_sign,T(0),iszero);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ template<typename T>`
`27`	`27`	`NBL_FORCE_INLINE T abs(const T& a)`
`28`	`28`	`{`
`29`	`29`	`auto isneg = a < T(0);`
`30`		`- using bool_type = typename std::remove_reference<decltype(isneg)>::type;`
	`30`	`+ using bool_type = std::remove_reference_t<decltype(isneg)>;`
`31`	`31`	`return core::mix<T,bool_type>(a,-a,isneg);`
`32`	`32`	`}`
`33`	`33`
`@@ -189,7 +189,7 @@ NBL_FORCE_INLINE T min(const T& a, const T& b)`
`189`	`189`	`{`
`190`	`190`	`T vb = T(b);`
`191`	`191`	`auto asmaller = a<vb;`
`192`		`- using bool_type = typename std::remove_reference<decltype(asmaller)>::type;`
	`192`	`+ using bool_type = std::remove_reference_t<decltype(asmaller)>;`
`193`	`193`	`return core::mix<T,bool_type>(vb,a,asmaller);`
`194`	`194`	`}`
`195`	`195`
`@@ -225,7 +225,7 @@ NBL_FORCE_INLINE T max(const T& a, const T& b)`
`225`	`225`	`{`
`226`	`226`	`T vb = T(b);`
`227`	`227`	`auto asmaller = a < vb;`
`228`		`- using bool_type = typename std::remove_reference<decltype(asmaller)>::type;`
	`228`	`+ using bool_type = std::remove_reference_t<decltype(asmaller)>;`
`229`	`229`	`return core::mix<T,bool_type>(a,vb,asmaller);`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou`
`96`	`96`	`if (rangeData)`
`97`	`97`	`{`
`98`	`98`	`auto alloctr = sadbRef->getFunctorAllocator();`
`99`		`- alloctr.deallocate(reinterpret_cast<typename std::remove_pointer<decltype(alloctr)>::type::pointer>(rangeData),numAllocs);`
	`99`	`+ alloctr.deallocate(reinterpret_cast<std::remove_pointer_t<decltype(alloctr)>::pointer>(rangeData),numAllocs);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -106,7 +106,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou`
`106`	`106`	`if (rangeData) // could swap the values instead`
`107`	`107`	`{`
`108`	`108`	`auto alloctr = sadbRef->getFunctorAllocator();`
`109`		`- alloctr.deallocate(reinterpret_cast<typename std::remove_pointer<decltype(alloctr)>::type::pointer>(rangeData),numAllocs);`
	`109`	`+ alloctr.deallocate(reinterpret_cast<std::remove_pointer_t<decltype(alloctr)>::pointer>(rangeData),numAllocs);`
`110`	`110`	`}`
`111`	`111`	`sadbRef = other.sadbRef;`
`112`	`112`	`rangeData = other.rangeData;`
`@@ -147,7 +147,7 @@ class NBL_API SubAllocatedDataBuffer : protected core::impl::FriendOfHeterogenou`
`147`	`147`	`}`
`148`	`148`	`};`
`149`	`149`	`constexpr static bool UsingDefaultFunctor = std::is_same<CustomDeferredFreeFunctor,void>::value;`
`150`		`- using DeferredFreeFunctor = typename std::conditional<UsingDefaultFunctor,DefaultDeferredFreeFunctor,CustomDeferredFreeFunctor>::type;`
	`150`	`+ using DeferredFreeFunctor = std::conditional_t<UsingDefaultFunctor,DefaultDeferredFreeFunctor,CustomDeferredFreeFunctor>;`
`151`	`151`	`GPUDeferredEventHandlerST<DeferredFreeFunctor> deferredFrees;`
`152`	`152`	`core::allocator<std::tuple<size_type,size_type,void*> > functorAllocator; // TODO : CMemoryPool<RobustGeneralpurposeAllocator> a-la naughty do`
`153`	`153`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ using namespace nbl::asset;`
`683`	`683`
`684`	`684`	`for (const auto& glTFprimitive : glTFMesh.primitives)`
`685`	`685`	`{`
`686`		`- typedef std::remove_reference<decltype(glTFprimitive)>::type SGLTFPrimitive;`
	`686`	`+ std::remove_reference_t<decltype(glTFprimitive)> SGLTFPrimitive;`
`687`	`687`
`688`	`688`	`auto cpuMeshBuffer = core::make_smart_refctd_ptr<ICPUMeshBuffer>();`
`689`	`689`	`cpuMeshBuffer->setPositionAttributeIx(SAttributes::POSITION_ATTRIBUTE_LAYOUT_ID);`
`@@ -710,7 +710,7 @@ using namespace nbl::asset;`
`710`	`710`	`const auto& globalOffsetInBufferBindingResource = glTFbufferView.byteOffset.has_value() ? glTFbufferView.byteOffset.value() : 0u;`
`711`	`711`	`const auto& relativeOffsetInBufferViewAttribute = glTFAccessor.byteOffset.has_value() ? glTFAccessor.byteOffset.value() : 0u;`
`712`	`712`
`713`		`- typedef std::remove_reference<decltype(glTFbufferView)>::type SGLTFBufferView;`
	`713`	`+ std::remove_reference_t<decltype(glTFbufferView)> SGLTFBufferView;`
`714`	`714`
`715`	`715`	`auto setBufferBinding = [&](uint32_t target) -> void`
`716`	`716`	`{`