[fix] windows build

andyoknen · Sep 15, 2019 · c5b637c · c5b637c
1 parent 79e0f36
commit c5b637c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cpp_src/core/nsselecter/btreeindexiterator.h b/cpp_src/core/nsselecter/btreeindexiterator.h
@@ -11,7 +11,7 @@ template <class T>
 class BtreeIndexIterator : public IndexIterator {
 public:
 	explicit BtreeIndexIterator(const T& idxMap) : idxMap_(idxMap), first_(idxMap.begin()), last_(idxMap.end()) {}
-	BtreeIndexIterator(const T& idxMap, const decltype(idxMap.begin())& first, const decltype(idxMap.begin())& last)
+	BtreeIndexIterator(const T& idxMap, const typename T::iterator& first, const typename T::iterator& last)
 		: idxMap_(idxMap), first_(first), last_(last) {}
 	~BtreeIndexIterator() override final {}
 
@@ -59,8 +59,8 @@ class BtreeIndexIterator : public IndexIterator {
 private:
 	std::shared_ptr<BtreeIndexIteratorImpl<T>> impl_;
 	const T& idxMap_;
-	decltype(idxMap_.begin()) first_;
-	decltype(idxMap_.begin()) last_;
+	const typename T::const_iterator first_;
+	const typename T::const_iterator last_;
 	size_t cachedIters_ = std::numeric_limits<size_t>::max();
 };
 

diff --git a/cpp_src/core/nsselecter/btreeindexiteratorimpl.h b/cpp_src/core/nsselecter/btreeindexiteratorimpl.h
@@ -119,8 +119,8 @@ class BtreeIndexIteratorImpl {
 	IdType currVal_ = INT_MIN;
 	IdsetType currentIdsetType_;
 
-	typedef decltype(idxMap_.begin()) ForwardIterator;
-	typedef decltype(idxMap_.rbegin()) ReverseIterator;
+	using ForwardIterator = typename T::const_iterator;
+	using ReverseIterator = typename T::const_reverse_iterator;
 };
 
 template <class T>