diff options
| author | maximius <none@none> | 2009-09-30 03:29:08 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-30 03:29:08 -0700 |
| commit | f0d592489162b8bf7740bbc3db038f81aa3af7e8 (patch) | |
| tree | 45513c11bc5fb9378f499e14506b555cb9a224f6 /src/shared/Common.h | |
| parent | 693251497a751821711262382442b54b91446231 (diff) | |
*Cleanup, add two new functions, attempt to fix arena point flushing for offline players.
--HG--
branch : trunk
Diffstat (limited to 'src/shared/Common.h')
| -rw-r--r-- | src/shared/Common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/Common.h b/src/shared/Common.h index a274c5d5a0b..8c948fb1d6d 100644 --- a/src/shared/Common.h +++ b/src/shared/Common.h @@ -72,7 +72,7 @@ # pragma warning(disable:4311) // 'variable' : pointer truncation from 'type' to 'type' # pragma warning(disable:4355) // 'this' : used in base member initializer list # pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning) -# pragma warning(disable:4522) //warning when class has 2 constructosr +# pragma warning(disable:4522) //warning when class has 2 constructors #endif // __SHOW_STUPID_WARNINGS__ #endif // __GNUC__ @@ -199,7 +199,7 @@ extern char const* localeNames[MAX_LOCALE]; LocaleConstant GetLocaleByName(const std::string& name); -// we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some pother platforms) +// we always use stdlibc++ std::max/std::min, undefine some not C++ standard defines (Win API and some other platforms) #ifdef max #undef max #endif |