thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-01-18 19:47:15 +01:00
Code Releases Activity

Update Vector.hpp

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-03-28 22:36:08 +03:00
parent f95a4f9305
commit 8d1b6576f3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/Library/Utils/Vector.hpp
View File

@ -216,7 +216,7 @@ template < class T > struct SqVector
const Reference & ValidRef() const { Validate(); return mC; } const Reference & ValidRef() const { Validate(); return mC; }
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Make sure an index is within rance and return the container it. Container must exist. * Make sure an index is within range and return the container. Container must exist.
*/ */
Container & ValidIdx(SQInteger i) Container & ValidIdx(SQInteger i)
{ {
@ -228,7 +228,7 @@ template < class T > struct SqVector
} }
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Make sure an index is within rance and return the container it. Container must exist. * Make sure an index is within range and return the container. Container must exist.
*/ */
const Container & ValidIdx(SQInteger i) const const Container & ValidIdx(SQInteger i) const
{ {
@ -292,7 +292,7 @@ template < class T > struct SqVector
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Retrieve the first element in the container. * Retrieve the first element in the container.
*/ */
SQMOD_NODISCARD typename std::add_const< ReturnType >::type Front() SQMOD_NODISCARD typename std::add_const< ReturnType >::type Front()
{ {
return ValidPop().front(); return ValidPop().front();
} }
@ -300,7 +300,7 @@ template < class T > struct SqVector
/* -------------------------------------------------------------------------------------------- /* --------------------------------------------------------------------------------------------
* Retrieve the last element in the container. * Retrieve the last element in the container.
*/ */
SQMOD_NODISCARD typename std::add_const< ReturnType >::type Back() SQMOD_NODISCARD typename std::add_const< ReturnType >::type Back()
{ {
return ValidPop().back(); return ValidPop().back();
} }
@ -578,7 +578,7 @@ template < class T > struct SqVector
*/ */
SqVector & Reverse() SqVector & Reverse()
{ {
std::reverse(Valid().begin(), Valid().end()); std::reverse(Valid().begin(), Valid().end());
return *this; return *this;
} }
@ -623,7 +623,7 @@ template < class T > struct SqVector
Validate(); Validate();
if (static_cast< size_t >(p) >= mC->size()) if (static_cast< size_t >(p) >= mC->size())
{ {
STHROWF("Invalid container index ({})", p); STHROWF("Invalid container index ({} >= {})", p, mC->size());
} }
for (auto i = static_cast< size_t >(p); n--; ++i) for (auto i = static_cast< size_t >(p); n--; ++i)
{ {
@ -642,11 +642,11 @@ template < class T > struct SqVector
Validate(); Validate();
if (static_cast< size_t >(p) >= mC->size()) if (static_cast< size_t >(p) >= mC->size())
{ {
STHROWF("Invalid container index (" PRINT_INT_FMT ")", p); STHROWF("Invalid container index ({} >= {})", p, mC->size());
} }
else if (static_cast< size_t >(p + n) >= mC->size()) else if (static_cast< size_t >(p + n) >= mC->size())
{ {
STHROWF("Invalid container index ({})", p + n); STHROWF("Invalid container index ({} >= {})", p + n, mC->size());
} }
for (n = (p + n); p <= n; ++p) for (n = (p + n); p <= n; ++p)
{ {