mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11589] Fix compile for "old" compilers.

Browse source 
Need to avoid using "override" as parameter or variable name now...
This commit is contained in:
Lynx3d 2011-06-02 23:47:53 +02:00
parent f45e9ad680
commit 6b8f9fe03d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/framework/Dynamic/ObjectRegistry.h
View file

@ -43,12 +43,12 @@ class MANGOS_DLL_DECL ObjectRegistry
} }
/// Inserts a registry item /// Inserts a registry item
bool InsertItem(T *obj, Key key, bool override = false) bool InsertItem(T *obj, Key key, bool replace = false)
{ {
typename RegistryMapType::iterator iter = i_registeredObjects.find(key); typename RegistryMapType::iterator iter = i_registeredObjects.find(key);
if( iter != i_registeredObjects.end() ) if( iter != i_registeredObjects.end() )
{ {
if( !override ) if( !replace )
return false; return false;
delete iter->second; delete iter->second;
i_registeredObjects.erase(iter); i_registeredObjects.erase(iter);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11588" #define REVISION_NR "11589"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__