diff --git a/MoltenVK/MoltenVK/Utility/MVKVector.h b/MoltenVK/MoltenVK/Utility/MVKVector.h index 4a33360f..37461004 100755 --- a/MoltenVK/MoltenVK/Utility/MVKVector.h +++ b/MoltenVK/MoltenVK/Utility/MVKVector.h @@ -74,7 +74,7 @@ template class MVKVector mvk_vector_allocator_base *alc_ptr; public: - class iterator + class iterator : public std::iterator { const MVKVector *vector; size_t index; @@ -99,6 +99,8 @@ public: }; public: + typedef Type value_type; + MVKVector() = delete; MVKVector( mvk_vector_allocator_base *a ) : alc_ptr{ a } { } virtual ~MVKVector() { } @@ -137,8 +139,7 @@ template class MVKVector { mvk_vector_allocator_base *alc_ptr; -public: - class iterator + class iterator : public std::iterator { const MVKVector *vector; size_t index; @@ -163,6 +164,8 @@ public: }; public: + typedef Type* value_type; + MVKVector() = delete; MVKVector( mvk_vector_allocator_base *a ) : alc_ptr{ a } { } virtual ~MVKVector() { } @@ -203,7 +206,7 @@ template> cl Allocator alc; public: - class iterator + class iterator : public std::iterator { const MVKVectorImpl *vector; size_t index; @@ -635,7 +638,7 @@ template class MVKVectorImpl : Allocator alc; public: - class iterator + class iterator : public std::iterator { MVKVectorImpl *vector; size_t index; diff --git a/MoltenVK/MoltenVK/Utility/MVKVectorAllocator.h b/MoltenVK/MoltenVK/Utility/MVKVectorAllocator.h index a5c320a4..4379af6d 100755 --- a/MoltenVK/MoltenVK/Utility/MVKVectorAllocator.h +++ b/MoltenVK/MoltenVK/Utility/MVKVectorAllocator.h @@ -44,6 +44,7 @@ template class mvk_vector_allocator_base { public: + typedef T value_type; T *ptr; size_t num_elements_used;