aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-04-29 11:55:23 +1000
committerNeil <nyamatongwe@gmail.com>2014-04-29 11:55:23 +1000
commit87c435a58c291770bedbc1302a86dacff14cac4f (patch)
tree9c86ec710c3f89844a9c31cc279fbb48184b6bdd /lexlib
parent7005b0bbc01565d1dd756ce87337542f52db8b07 (diff)
downloadscintilla-mirror-87c435a58c291770bedbc1302a86dacff14cac4f.tar.gz
Stop disabling warnings where no longer needed.
Diffstat (limited to 'lexlib')
-rw-r--r--lexlib/LexerModule.h2
-rw-r--r--lexlib/PropSetSimple.cxx5
2 files changed, 1 insertions, 6 deletions
diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h
index e502541b2..35fa30c69 100644
--- a/lexlib/LexerModule.h
+++ b/lexlib/LexerModule.h
@@ -72,7 +72,7 @@ inline int Maximum(int a, int b) {
// Shut up annoying Visual C++ warnings:
#ifdef _MSC_VER
-#pragma warning(disable: 4244 4309 4514 4710)
+#pragma warning(disable: 4244 4309)
#endif
#ifdef SCI_NAMESPACE
diff --git a/lexlib/PropSetSimple.cxx b/lexlib/PropSetSimple.cxx
index 6f4553a07..6592d70eb 100644
--- a/lexlib/PropSetSimple.cxx
+++ b/lexlib/PropSetSimple.cxx
@@ -11,11 +11,6 @@
#include <string.h>
#include <stdio.h>
-#ifdef _MSC_VER
-// Visual C++ doesn't like unreachable code in its own headers.
-#pragma warning(disable: 4018 4100 4245 4511 4512 4663 4702)
-#endif
-
#include <string>
#include <map>