From: Tom <rtp...@us...> - 2010-05-24 02:45:17
|
gemrb: Infinity Engine emulator The branch master has been updated via b903f4523c6bc30ca78e28db1d4adf79776efd2d (commit) Summary of changes: gemrb/core/Audio.h | 2 +- gemrb/core/SaveGameIterator.h | 2 +- gemrb/core/Sprite2D.h | 2 +- gemrb/core/Video.h | 2 +- gemrb/plugins/GUIScript/PythonHelpers.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) from d2a49c08369eb1e56b1afd04fe095f2130a0b0ef (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b903f4523c6bc30ca78e28db1d4adf79776efd2d commit b903f4523c6bc30ca78e28db1d4adf79776efd2d Author: Tom Prince <tom...@ua...> Date: Sun May 23 22:42:48 2010 -0400 TypeID: Add some missing consts. Signed-off-by: Tom Prince <tom...@ua...> diff --git a/gemrb/core/Audio.h b/gemrb/core/Audio.h index 5e8fb41..ab4173e 100644 --- a/gemrb/core/Audio.h +++ b/gemrb/core/Audio.h @@ -35,7 +35,7 @@ class AmbientMgr; class GEM_EXPORT Audio : public Plugin { public: - static TypeID ID; + static const TypeID ID; public: Audio(void); virtual ~Audio(); diff --git a/gemrb/core/SaveGameIterator.h b/gemrb/core/SaveGameIterator.h index bc53afa..447801b 100644 --- a/gemrb/core/SaveGameIterator.h +++ b/gemrb/core/SaveGameIterator.h @@ -35,7 +35,7 @@ class ImageMgr; class GEM_EXPORT SaveGame : public Held<SaveGame> { public: - static TypeID ID; + static const TypeID ID; public: SaveGame(const char* path, const char* name, const char* prefix, const char* slotname, int pCount, int saveID); ~SaveGame(); diff --git a/gemrb/core/Sprite2D.h b/gemrb/core/Sprite2D.h index 9965113..ceddf5a 100644 --- a/gemrb/core/Sprite2D.h +++ b/gemrb/core/Sprite2D.h @@ -58,7 +58,7 @@ public: class GEM_EXPORT Sprite2D { public: - static TypeID ID; + static const TypeID ID; public: /** Pointer to the Driver Video Structure */ void* vptr; diff --git a/gemrb/core/Video.h b/gemrb/core/Video.h index 7f5104a..d6c52d5 100644 --- a/gemrb/core/Video.h +++ b/gemrb/core/Video.h @@ -70,7 +70,7 @@ enum SpriteBlitFlags { class GEM_EXPORT Video : public Plugin { public: - static TypeID ID; + static const TypeID ID; public: Video(void); virtual ~Video(void); diff --git a/gemrb/plugins/GUIScript/PythonHelpers.h b/gemrb/plugins/GUIScript/PythonHelpers.h index 906f31f..b98ea0a 100644 --- a/gemrb/plugins/GUIScript/PythonHelpers.h +++ b/gemrb/plugins/GUIScript/PythonHelpers.h @@ -44,7 +44,7 @@ public: if (Holder<T>::ptr) { Holder<T>::ptr->acquire(); GUIScript *gs = (GUIScript *) core->GetGUIScriptEngine(); - PyObject *obj = PyCObject_FromVoidPtrAndDesc(Holder<T>::ptr,&T::ID,PyRelease); + PyObject *obj = PyCObject_FromVoidPtrAndDesc(Holder<T>::ptr,const_cast<TypeID*>(&T::ID),PyRelease); PyObject *tuple = PyTuple_New(1); PyTuple_SET_ITEM(tuple, 0, obj); return gs->ConstructObject(T::ID.description, tuple); ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |