mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-07-04 05:55:47 -07:00
Fix JSInterface_IGUITextOwner build on VS2015 following 3d07327837 (which works on gcc, clang and Jenkins), reported by minohaka.
Retract IGUIObject override keyword from that commit, because clang recommends to use it for either every or no overriding class member (which then should be done consistently for all classes inheriting IGUIObject, refs D2144). This was SVN commit r22602.
This commit is contained in:
parent
11dc5e3901
commit
cd82b62e25
2 changed files with 3 additions and 3 deletions
|
|
@ -59,7 +59,7 @@ public:
|
|||
/**
|
||||
* Subscribe the custom JS methods.
|
||||
*/
|
||||
void CreateJSObject() override;
|
||||
void CreateJSObject();
|
||||
|
||||
/**
|
||||
* @see IGUIObject#HandleMessage()
|
||||
|
|
@ -91,7 +91,7 @@ public:
|
|||
/**
|
||||
* Workaround to avoid a dynamic_cast which can be 80 times slower than this.
|
||||
*/
|
||||
virtual void* GetTextOwner() override { return this; }
|
||||
virtual void* GetTextOwner() { return this; }
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
JSFunctionSpec JSI_IGUITextOwner::JSI_methods[] =
|
||||
{
|
||||
JS_FN("getTextSize", GetTextSize, 0, 0),
|
||||
JS_FN("getTextSize", JSI_IGUITextOwner::GetTextSize, 0, 0),
|
||||
JS_FS_END
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue