Fixes for Linux compilation (not everything fixed yet).

This commit is contained in:
Adam Sawicki 2017-09-12 20:57:27 +02:00
parent 2fd0415efa
commit 7d1c689f1e

View File

@ -1226,7 +1226,7 @@ remove them if not needed.
#include <cassert> // for assert #include <cassert> // for assert
#include <algorithm> // for min, max #include <algorithm> // for min, max
#include <mutex> // for std::mutex #include <mutex> // for std::mutex
#include <atomic> // for std::atomic_int64_t #include <atomic> // for std::atomic_uint32_t
#if !defined(_WIN32) #if !defined(_WIN32)
#include <malloc.h> // for aligned_alloc() #include <malloc.h> // for aligned_alloc()
@ -1977,7 +1977,7 @@ template<typename CmpLess, typename VectorT>
bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value) bool VmaVectorRemoveSorted(VectorT& vector, const typename VectorT::value_type& value)
{ {
CmpLess comparator; CmpLess comparator;
VectorT::iterator it = VmaBinaryFindFirstNotLess( typename VectorT::iterator it = VmaBinaryFindFirstNotLess(
vector.data(), vector.data(),
vector.data() + vector.size(), vector.data() + vector.size(),
value, value,
@ -1995,7 +1995,7 @@ template<typename CmpLess, typename VectorT>
size_t VmaVectorFindSorted(const VectorT& vector, const typename VectorT::value_type& value) size_t VmaVectorFindSorted(const VectorT& vector, const typename VectorT::value_type& value)
{ {
CmpLess comparator; CmpLess comparator;
VectorT::iterator it = VmaBinaryFindFirstNotLess( typename VectorT::iterator it = VmaBinaryFindFirstNotLess(
vector.data(), vector.data(),
vector.data() + vector.size(), vector.data() + vector.size(),
value, value,