Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Altered vector_replace_with_last to work around MSVC2010 compiler bug.

Browse Source
This commit is contained in:
Shyotl
2014-06-22 03:40:12 -05:00
parent 7c073c1db7
commit 165af85894
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llstl.h
View File

@@ -241,12 +241,12 @@ inline typename T::mapped_type get_ptr_in_map(const T& inmap, typename T::key_ty
template <typename T> template <typename T>
inline typename T::iterator vector_replace_with_last(T& invec, typename T::iterator& iter) inline typename T::iterator vector_replace_with_last(T& invec, typename T::iterator& iter)
{ {
typename T::iterator last = invec.end(); --last; typename T::iterator last = invec.end();
if (iter == invec.end()) if (iter == invec.end())
{ {
return iter; return iter;
} }
else if (iter == last) else if (iter == --last)
{ {
invec.pop_back(); invec.pop_back();
return invec.end(); return invec.end();