diff options
| author | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
| commit | 993fd14ddfc881cf5be951df77da0338124d68cc (patch) | |
| tree | 828cd0c784698ca4533aeaf2592d9fed75fe55a3 /src/Globals.h | |
| parent | Merge pull request #1183 from Howaner/Sounds (diff) | |
| download | cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.gz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.bz2 cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.lz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.xz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.zst cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Globals.h b/src/Globals.h index 998676fb1..62e0ad285 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -15,8 +15,8 @@ // Disable some warnings that we don't care about: #pragma warning(disable:4100) // Unreferenced formal parameter - - // Useful warnings from warning level 4: + + // Useful warnings from warning level 4: #pragma warning(3 : 4127) // Conditional expression is constant #pragma warning(3 : 4189) // Local variable is initialized but not referenced #pragma warning(3 : 4245) // Conversion from 'type1' to 'type2', signed/unsigned mismatch @@ -58,8 +58,8 @@ // override is part of c++11 #if __cplusplus < 201103L - #define override - #endif + #define override + #endif #define OBSOLETE __attribute__((deprecated)) @@ -145,7 +145,7 @@ class SizeChecker; template <typename T, size_t Size> class SizeChecker<T, Size, true> { - T v; + T v; }; template class SizeChecker<Int64, 8>; |