thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-02-21 20:27:13 +01:00
Code Releases Activity

Fix const correctness in utility functions.

Browse Source 
By not taking the object reference as const we are forced to make copies of objects that are const or use const_cast. Eitherway, this is the correct way because objects are not modified.
This commit is contained in:
Sandu Liviu Catalin 2016-06-13 00:27:06 +03:00
parent 67d0360fb3
commit 85e881effa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shared/Base/Utility.cpp
View File

@ -807,45 +807,45 @@ Object MakeULongObj(HSQUIRRELVM vm, Uint64 val)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Int64 FetchSLongObjVal(Object & val) Int64 FetchSLongObjVal(const Object & val)
{ {
// Obtain the initial stack size // Obtain the initial stack size
const StackGuard sg(DefaultVM::Get()); const StackGuard sg(DefaultVM::Get());
// Push the specified object onto the stack // Push the specified object onto the stack
Var< Object & >::push(DefaultVM::Get(), val); Var< const Object & >::push(DefaultVM::Get(), val);
// Retrieve and return the object value from the stack // Retrieve and return the object value from the stack
return PopStackSLong(DefaultVM::Get(), -1); return PopStackSLong(DefaultVM::Get(), -1);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Uint64 FetchULongObjVal(Object & val) Uint64 FetchULongObjVal(const Object & val)
{ {
// Obtain the initial stack size // Obtain the initial stack size
const StackGuard sg(DefaultVM::Get()); const StackGuard sg(DefaultVM::Get());
// Push the specified object onto the stack // Push the specified object onto the stack
Var< Object & >::push(DefaultVM::Get(), val); Var< const Object & >::push(DefaultVM::Get(), val);
// Retrieve and return the object value from the stack // Retrieve and return the object value from the stack
return PopStackSLong(DefaultVM::Get(), -1); return PopStackSLong(DefaultVM::Get(), -1);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Int64 FetchSLongObjVal(HSQUIRRELVM vm, Object & val) Int64 FetchSLongObjVal(HSQUIRRELVM vm, const Object & val)
{ {
// Obtain the initial stack size // Obtain the initial stack size
const StackGuard sg(vm); const StackGuard sg(vm);
// Push the specified object onto the stack // Push the specified object onto the stack
Var< Object & >::push(vm, val); Var< const Object & >::push(vm, val);
// Retrieve and return the object value from the stack // Retrieve and return the object value from the stack
return PopStackSLong(vm, -1); return PopStackSLong(vm, -1);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Uint64 FetchULongObjVal(HSQUIRRELVM vm, Object & val) Uint64 FetchULongObjVal(HSQUIRRELVM vm, const Object & val)
{ {
// Obtain the initial stack size // Obtain the initial stack size
const StackGuard sg(vm); const StackGuard sg(vm);
// Push the specified object onto the stack // Push the specified object onto the stack
Var< Object & >::push(vm, val); Var< const Object & >::push(vm, val);
// Retrieve and return the object value from the stack // Retrieve and return the object value from the stack
return PopStackSLong(vm, -1); return PopStackSLong(vm, -1);
} }

8
shared/Base/Utility.hpp
View File

@ -1468,22 +1468,22 @@ Object MakeULongObj(HSQUIRRELVM vm, Uint64 val);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Retrieve a signed 64 bit integer from an signed long integer object. * Retrieve a signed 64 bit integer from an signed long integer object.
*/ */
Int64 FetchSLongObjVal(Object & val); Int64 FetchSLongObjVal(const Object & val);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Retrieve a unsigned 64 bit integer from an unsigned long integer object. * Retrieve a unsigned 64 bit integer from an unsigned long integer object.
*/ */
Uint64 FetchULongObjVal(Object & val); Uint64 FetchULongObjVal(const Object & val);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Retrieve a signed 64 bit integer from an signed long integer object. * Retrieve a signed 64 bit integer from an signed long integer object.
*/ */
Int64 FetchSLongObjVal(HSQUIRRELVM vm, Object & val); Int64 FetchSLongObjVal(HSQUIRRELVM vm, const Object & val);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Retrieve a unsigned 64 bit integer from an unsigned long integer object. * Retrieve a unsigned 64 bit integer from an unsigned long integer object.
*/ */
Uint64 FetchULongObjVal(HSQUIRRELVM vm, Object & val); Uint64 FetchULongObjVal(HSQUIRRELVM vm, const Object & val);
/* ------------------------------------------------------------------------------------------------ /* ------------------------------------------------------------------------------------------------
* Attempt to pop the value at the specified index on the stack as a native integer. * Attempt to pop the value at the specified index on the stack as a native integer.