Permalink
Browse files

[11589] Fix compile for "old" compilers.

Need to avoid using "override" as parameter or variable name now...
  • Loading branch information...
1 parent 9af1668 commit 053e0285fbb03360efffb7a1ce83d10da0b8efce @Lynx3d Lynx3d committed Jun 2, 2011
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/framework/Dynamic/ObjectRegistry.h
  2. +1 −1 src/shared/revision_nr.h
View
4 src/framework/Dynamic/ObjectRegistry.h
@@ -43,12 +43,12 @@ class MANGOS_DLL_DECL ObjectRegistry
}
/// 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);
if( iter != i_registeredObjects.end() )
{
- if( !override )
+ if( !replace )
return false;
delete iter->second;
i_registeredObjects.erase(iter);
View
2 src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "11588"
+ #define REVISION_NR "11589"
#endif // __REVISION_NR_H__

0 comments on commit 053e028

Please sign in to comment.