UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a compat regression, forgot msvc does funky things with overloaded virtual calls

Browse Source 
--HG--
branch : refac-jit
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/refac-jit%402399
This commit is contained in:
David Anderson 2008-07-11 06:51:21 +00:00
parent 232f344c41
commit 5668f23b50
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/sourcepawn/sp_vm_api.h
View File

@ -240,7 +240,7 @@ namespace SourcePawn
* @param result Pointer to store return value in. * @param result Pointer to store return value in.
* @return Error code, if any. * @return Error code, if any.
*/ */
virtual int Execute(IPluginContext *ctx, cell_t *result) =0; virtual int Execute2(IPluginContext *ctx, cell_t *result) =0;
/** /**
* @brief Executes the function with the given parameter array. * @brief Executes the function with the given parameter array.
@ -256,7 +256,7 @@ namespace SourcePawn
* @param result Pointer to store result of function on return. * @param result Pointer to store result of function on return.
* @return SourcePawn error code (if any). * @return SourcePawn error code (if any).
*/ */
virtual int CallFunction(IPluginContext *ctx, virtual int CallFunction2(IPluginContext *ctx,
const cell_t *params, const cell_t *params,
unsigned int num_params, unsigned int num_params,
cell_t *result) =0; cell_t *result) =0;
@ -833,7 +833,7 @@ namespace SourcePawn
* @param result Optional pointer to store the result on success. * @param result Optional pointer to store the result on success.
* @return Error code. * @return Error code.
*/ */
virtual int Execute(IPluginFunction *function, virtual int Execute2(IPluginFunction *function,
const cell_t *params, const cell_t *params,
unsigned int num_params, unsigned int num_params,
cell_t *result) =0; cell_t *result) =0;

2
sourcepawn/jit/sp_vm_basecontext.cpp
View File

@ -511,7 +511,7 @@ bool BaseContext::IsInExec()
return m_InExec; return m_InExec;
} }
int BaseContext::Execute(IPluginFunction *function, const cell_t *params, unsigned int num_params, cell_t *result) int BaseContext::Execute2(IPluginFunction *function, const cell_t *params, unsigned int num_params, cell_t *result)
{ {
int ir; int ir;
int serial; int serial;

2
sourcepawn/jit/sp_vm_basecontext.h
View File

@ -86,7 +86,7 @@ public: //IPluginContext
cell_t *GetNullRef(SP_NULL_TYPE type); cell_t *GetNullRef(SP_NULL_TYPE type);
int LocalToStringNULL(cell_t local_addr, char **addr); int LocalToStringNULL(cell_t local_addr, char **addr);
int BindNativeToIndex(uint32_t index, SPVM_NATIVE_FUNC native); int BindNativeToIndex(uint32_t index, SPVM_NATIVE_FUNC native);
int Execute(IPluginFunction *function, const cell_t *params, unsigned int num_params, cell_t *result); int Execute2(IPluginFunction *function, const cell_t *params, unsigned int num_params, cell_t *result);
IPluginRuntime *GetRuntime(); IPluginRuntime *GetRuntime();
int GetLastNativeError(); int GetLastNativeError();
cell_t *GetLocalParams(); cell_t *GetLocalParams();

12
sourcepawn/jit/sp_vm_function.cpp
View File

@ -55,12 +55,12 @@ bool CFunction::IsRunnable()
int CFunction::CallFunction(const cell_t *params, unsigned int num_params, cell_t *result) int CFunction::CallFunction(const cell_t *params, unsigned int num_params, cell_t *result)
{ {
return CallFunction(m_pRuntime->GetDefaultContext(), params, num_params, result); return CallFunction2(m_pRuntime->GetDefaultContext(), params, num_params, result);
} }
int CFunction::CallFunction(IPluginContext *pContext, const cell_t *params, unsigned int num_params, cell_t *result) int CFunction::CallFunction2(IPluginContext *pContext, const cell_t *params, unsigned int num_params, cell_t *result)
{ {
return pContext->Execute(this, params, num_params, result); return pContext->Execute2(this, params, num_params, result);
} }
IPluginContext *CFunction::GetParentContext() IPluginContext *CFunction::GetParentContext()
@ -170,10 +170,10 @@ void CFunction::Cancel()
int CFunction::Execute(cell_t *result) int CFunction::Execute(cell_t *result)
{ {
return Execute(m_pRuntime->GetDefaultContext(), result); return Execute2(m_pRuntime->GetDefaultContext(), result);
} }
int CFunction::Execute(IPluginContext *ctx, cell_t *result) int CFunction::Execute2(IPluginContext *ctx, cell_t *result)
{ {
int err = SP_ERROR_NONE; int err = SP_ERROR_NONE;
@ -283,7 +283,7 @@ int CFunction::Execute(IPluginContext *ctx, cell_t *result)
/* Make the call if we can */ /* Make the call if we can */
if (err == SP_ERROR_NONE) if (err == SP_ERROR_NONE)
{ {
if ((err = CallFunction(ctx, temp_params, numparams, result)) != SP_ERROR_NONE) if ((err = CallFunction2(ctx, temp_params, numparams, result)) != SP_ERROR_NONE)
{ {
docopies = false; docopies = false;
} }

4
sourcepawn/jit/sp_vm_function.h
View File

@ -79,8 +79,8 @@ public:
void Invalidate(); void Invalidate();
bool IsRunnable(); bool IsRunnable();
funcid_t GetFunctionID(); funcid_t GetFunctionID();
int Execute(IPluginContext *ctx, cell_t *result); int Execute2(IPluginContext *ctx, cell_t *result);
int CallFunction(IPluginContext *ctx, int CallFunction2(IPluginContext *ctx,
const cell_t *params, const cell_t *params,
unsigned int num_params, unsigned int num_params,
cell_t *result); cell_t *result);

2
sourcepawn/jit/x86/jit_x86.cpp
View File

@ -38,7 +38,7 @@
#include "../jit_version.h" #include "../jit_version.h"
#include "../sp_vm_engine.h" #include "../sp_vm_engine.h"
#include "../engine2.h" #include "../engine2.h"
#include "BaseRuntime.h" #include "../BaseRuntime.h"
#include "../sp_vm_basecontext.h" #include "../sp_vm_basecontext.h"
#if defined USE_UNGEN_OPCODES #if defined USE_UNGEN_OPCODES