diff options
author | Praetonus <praetonus@gmail.com> | 2014-05-14 16:42:34 +0200 |
---|---|---|
committer | Praetonus <praetonus@gmail.com> | 2014-05-15 21:32:47 +0200 |
commit | f296095191c7b5c6b10f79c2b1433dc227a462f5 (patch) | |
tree | 2be2a3ee995851f2212c985c358e96c032a9096d /src/server/game/Instances/InstanceScript.h | |
parent | 9d760098a5a1bf5203fce8e3ba7b462a7885ee75 (diff) |
Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.
-Fix warnings from -Woverflow on implicit constant conversion.
-Fix warnings from -pedantic.
-Fix warnings from -pedantic.
-Fix warnings from -Wformat.
Two minor changes in addition :
-Replace a defined value equal to 2^31 - 1 by std::numeric_limits<int>::max().
-Remove useless null-check on pointer returned by new. New doesn't returns nullptr on failure, it throws std::bad_alloc.
Diffstat (limited to 'src/server/game/Instances/InstanceScript.h')
-rw-r--r-- | src/server/game/Instances/InstanceScript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 3050443edc0..9e11c566c22 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -243,7 +243,7 @@ AI* GetInstanceAI(T* obj, char const* scriptName) return new AI(obj); return NULL; -}; +} template<class AI, class T> AI* GetInstanceAI(T* obj) @@ -253,6 +253,6 @@ AI* GetInstanceAI(T* obj) return new AI(obj); return NULL; -}; +} #endif // TRINITY_INSTANCE_DATA_H |