Integrating latest 47acbe8
This commit is contained in:
@@ -104,7 +104,7 @@ namespace AZ
|
||||
RootIterator& operator++();
|
||||
RootIterator operator++(int);
|
||||
|
||||
const Iterator& GetBaseIterator();
|
||||
const Iterator& GetBaseIterator() const;
|
||||
protected:
|
||||
Iterator m_iterator;
|
||||
Function m_converter;
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace AZ
|
||||
}
|
||||
|
||||
template<typename Iterator, typename ReturnType>
|
||||
const Iterator& ConvertIterator<Iterator, ReturnType, void>::GetBaseIterator()
|
||||
const Iterator& ConvertIterator<Iterator, ReturnType, void>::GetBaseIterator() const
|
||||
{
|
||||
return m_iterator;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace AZ
|
||||
RootIterator& operator++();
|
||||
RootIterator operator++(int);
|
||||
|
||||
const Iterator& GetBaseIterator();
|
||||
const Iterator& GetBaseIterator() const;
|
||||
|
||||
protected:
|
||||
// Pseudo default constructor.
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace AZ
|
||||
}
|
||||
|
||||
template<typename Iterator>
|
||||
auto FilterIterator<Iterator, void>::GetBaseIterator()->const Iterator&
|
||||
auto FilterIterator<Iterator, void>::GetBaseIterator() const -> const Iterator&
|
||||
{
|
||||
return m_iterator;
|
||||
}
|
||||
|
||||
@@ -44,6 +44,8 @@ namespace AZ
|
||||
Iterator cbegin() const;
|
||||
Iterator cend() const;
|
||||
|
||||
[[nodiscard]] bool empty() const;
|
||||
|
||||
private:
|
||||
Iterator m_begin;
|
||||
Iterator m_end;
|
||||
@@ -59,4 +61,4 @@ namespace AZ
|
||||
} // SceneAPI
|
||||
} // AZ
|
||||
|
||||
#include <SceneAPI/SceneCore/Containers/Views/View.inl>
|
||||
#include <SceneAPI/SceneCore/Containers/Views/View.inl>
|
||||
|
||||
@@ -62,6 +62,12 @@ namespace AZ
|
||||
{
|
||||
return m_end;
|
||||
}
|
||||
|
||||
template<typename Iterator>
|
||||
[[nodiscard]] bool View<Iterator>::empty() const
|
||||
{
|
||||
return m_begin == m_end;
|
||||
}
|
||||
}; // Views
|
||||
} // Containers
|
||||
} // SceneAPI
|
||||
|
||||
Reference in New Issue
Block a user