summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-17 19:13:23 +0200
committermadmaxoft <github@xoft.cz>2014-07-17 19:13:23 +0200
commit7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4 (patch)
tree54a0e32d887554b1131c8c9123027f16a7faf5d8 /src/Globals.h
parentFixed basic whitespace problems. (diff)
downloadcuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar.gz
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar.bz2
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar.lz
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar.xz
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.tar.zst
cuberite-7fff12bfacbb4bef1c02cea0ec10fdc9a6fb64e4.zip
Diffstat (limited to '')
-rw-r--r--src/Globals.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Globals.h b/src/Globals.h
index 62e0ad285..9b2f25f36 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -14,18 +14,18 @@
#pragma warning(disable:4481)
// Disable some warnings that we don't care about:
- #pragma warning(disable:4100) // Unreferenced formal parameter
+ #pragma warning(disable:4100) // Unreferenced formal parameter
// 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
- #pragma warning(3 : 4310) // Cast truncates constant value
- #pragma warning(3 : 4389) // Signed/unsigned mismatch
- #pragma warning(3 : 4505) // Unreferenced local function has been removed
- #pragma warning(3 : 4701) // Potentially unitialized local variable used
- #pragma warning(3 : 4702) // Unreachable code
- #pragma warning(3 : 4706) // Assignment within conditional expression
+ #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
+ #pragma warning(3 : 4310) // Cast truncates constant value
+ #pragma warning(3 : 4389) // Signed/unsigned mismatch
+ #pragma warning(3 : 4505) // Unreferenced local function has been removed
+ #pragma warning(3 : 4701) // Potentially unitialized local variable used
+ #pragma warning(3 : 4702) // Unreachable code
+ #pragma warning(3 : 4706) // Assignment within conditional expression
// Disabling this warning, because we know what we're doing when we're doing this:
#pragma warning(disable: 4355) // 'this' used in initializer list
@@ -34,7 +34,7 @@
#pragma warning(disable: 4512) // 'class': assignment operator could not be generated - reported for each class that has a reference-type member
// 2014_01_06 xoft: Disabled this warning because MSVC is stupid and reports it in obviously wrong places
- // #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data
+ // #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data
#define OBSOLETE __declspec(deprecated)