thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-07-05 08:27:10 +02:00
Code Releases Activity

Replace GetObject with GetObj to avoid collisions on Windows.

Browse Source 
ef you MS
This commit is contained in:
Sandu Liviu Catalin
2020-04-17 17:42:09 +03:00
parent 1242b8a2fc
commit e13d1a91e7
22 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/Misc/Algo.hpp
View File

@ -712,7 +712,7 @@ template <> struct InstSpec< CObject >
*/
static inline Instances::const_iterator CBegin()
{
return Core::Get().GetObjects().cbegin();
return Core::Get().GetObjs().cbegin();
}
/* --------------------------------------------------------------------------------------------
@ -720,7 +720,7 @@ template <> struct InstSpec< CObject >
*/
static inline Instances::const_iterator CEnd()
{
return Core::Get().GetObjects().cend();
return Core::Get().GetObjs().cend();
}
/* --------------------------------------------------------------------------------------------
@ -907,7 +907,7 @@ template < typename T > struct AppendElemFunc
void operator () (const typename InstSpec< T >::Instance & inst) const
{
// Push the script object on the stack
sq_pushobject(mVM, inst.mObj.GetObject());
sq_pushobject(mVM, inst.mObj.GetObj());
// Append the object at the back of the array
if (SQ_FAILED(sq_arrayappend(mVM, mIdx)))
{