diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:11:04 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:11:04 +0100 |
commit | 36b3e06a7e2ffc5bddebd8a749cb0743a841fcaf (patch) | |
tree | c5c324245d773e6679adca2a933d9791966a8186 /src/server/shared/Utilities/Util.cpp | |
parent | c0b031af4d3e8de03be491156dd13ac78f6770dc (diff) | |
parent | 73172c67f02b8f2649b762262d54aea7b7f94d07 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/shared/Utilities/Util.cpp')
-rwxr-xr-x | src/server/shared/Utilities/Util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 9917bbb5309..89942b978df 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -92,7 +92,7 @@ Tokens::Tokens(const std::string &src, const char sep, uint32 vectorReserve) void stripLineInvisibleChars(std::string &str) { - static std::string invChars = " \t\7\n"; + static std::string const invChars = " \t\7\n"; size_t wpos = 0; |