From d7cf24970aa9e2e5fd44ac660078a7e01ee959a0 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 10 Feb 2011 19:32:01 +0300 Subject: [PATCH] [11130] Make abstract function with body syntax compatible with GCC. --- src/game/MapPersistentStateMgr.h | 12 +++++++----- src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/game/MapPersistentStateMgr.h b/src/game/MapPersistentStateMgr.h index 76da29116..27caf84ac 100644 --- a/src/game/MapPersistentStateMgr.h +++ b/src/game/MapPersistentStateMgr.h @@ -85,11 +85,7 @@ class MapPersistentState void SaveGORespawnTime(uint32 loguid, time_t t); protected: - virtual bool CanBeUnload() const =0 - { - // prevent unload if used for loaded map - return !m_usedByMap; - } + virtual bool CanBeUnload() const =0; // body provided for subclasses bool UnloadIfEmpty(); void ClearRespawnTimes(); @@ -112,6 +108,12 @@ class MapPersistentState RespawnTimes m_goRespawnTimes; // lock MapPersistentState from unload, for example for temporary bound dungeon unload delay }; +inline bool MapPersistentState::CanBeUnload() const +{ + // prevent unload if used for loaded map + return !m_usedByMap; +} + class WorldPersistentState : public MapPersistentState { public: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 90d4e8f32..6f2f871cc 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11129" + #define REVISION_NR "11130" #endif // __REVISION_NR_H__