Skip to content

Commit

Permalink
[12366] fix clang compile error from implicit type conversion
Browse files Browse the repository at this point in the history
Signed-off-by: DasBlub <DasBlub@gmail.com>
  • Loading branch information
vermie authored and DasBlub committed Feb 21, 2013
1 parent 772a5bb commit ce05512
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/game/Unit.h
Expand Up @@ -2049,7 +2049,7 @@ void Unit::CallForAllControlledUnits(Func const& func, uint32 controlledMask)
func(pet);

if (controlledMask & CONTROLLED_MINIPET)
if (Unit* mini = GetMiniPet())
if (Pet* mini = GetMiniPet())
func(mini);

if (controlledMask & CONTROLLED_GUARDIANS)
Expand Down Expand Up @@ -2080,7 +2080,7 @@ bool Unit::CheckAllControlledUnits(Func const& func, uint32 controlledMask) cons
return true;

if (controlledMask & CONTROLLED_MINIPET)
if (Unit const* mini = GetMiniPet())
if (Pet const* mini = GetMiniPet())
if (func(mini))
return true;

Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "12365"
#define REVISION_NR "12366"
#endif // __REVISION_NR_H__

0 comments on commit ce05512

Please sign in to comment.