diff options
author | Johannes Schickel | 2012-09-21 02:18:54 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-09-21 02:35:50 +0200 |
commit | 8aceef971106ba35ab234b165dbe6e19c842f336 (patch) | |
tree | dc1286a31068872960cd3d5925acba78a2b912a7 /engines/pegasus/util.h | |
parent | b0079f4fa67099cec2c58e7907bf3fe09d0755cf (diff) | |
download | scummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.tar.gz scummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.tar.bz2 scummvm-rg350-8aceef971106ba35ab234b165dbe6e19c842f336.zip |
PEGASUS: Replace FunctionPtr by our Functor code in Common.
This "fixes" a segmentation fault in our buildbot's toolchain for DC.
The segmentation fault occured while compiling
engines/pegasus/ai/ai_condition.cpp.
Thanks to clone2727 for looking over this and testing it.
Diffstat (limited to 'engines/pegasus/util.h')
-rw-r--r-- | engines/pegasus/util.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/engines/pegasus/util.h b/engines/pegasus/util.h index 57839fca7b..16425343ca 100644 --- a/engines/pegasus/util.h +++ b/engines/pegasus/util.h @@ -47,24 +47,6 @@ private: int32 _objectID; }; -class FunctionPtr; - -typedef void (*tFunctionPtr)(FunctionPtr *theFunction, void *functionArg); - -class FunctionPtr { -public: - FunctionPtr(); - virtual ~FunctionPtr(); - - void setFunctionPtr(tFunctionPtr function, void *functionArg); - -protected: - void callFunction(); - - tFunctionPtr _function; - void *_functionArg; -}; - #define NUM_FLAGS (sizeof(Unit) * 8) #define BIT_INDEX_SHIFT (sizeof(Unit) + 2 - (sizeof(Unit)) / 3) #define BIT_INDEX_MASK (NUM_FLAGS - 1) |