diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-04-29 11:55:23 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-04-29 11:55:23 +1000 |
| commit | 87c435a58c291770bedbc1302a86dacff14cac4f (patch) | |
| tree | 9c86ec710c3f89844a9c31cc279fbb48184b6bdd | |
| parent | 7005b0bbc01565d1dd756ce87337542f52db8b07 (diff) | |
| download | scintilla-mirror-87c435a58c291770bedbc1302a86dacff14cac4f.tar.gz | |
Stop disabling warnings where no longer needed.
| -rw-r--r-- | include/Platform.h | 3 | ||||
| -rw-r--r-- | lexlib/LexerModule.h | 2 | ||||
| -rw-r--r-- | lexlib/PropSetSimple.cxx | 5 | ||||
| -rw-r--r-- | src/CharClassify.cxx | 5 | ||||
| -rw-r--r-- | src/RESearch.cxx | 5 |
5 files changed, 3 insertions, 17 deletions
diff --git a/include/Platform.h b/include/Platform.h index d83e7f26c..7683c9c84 100644 --- a/include/Platform.h +++ b/include/Platform.h @@ -518,7 +518,8 @@ public: // Shut up annoying Visual C++ warnings: #ifdef _MSC_VER -#pragma warning(disable: 4244 4309 4514 4710) +// This is: conversion from X to Y, possible loss of data +#pragma warning(disable: 4244) #endif #if defined(__GNUC__) && defined(SCINTILLA_QT) 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> diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx index 7e3db737e..cc431630d 100644 --- a/src/CharClassify.cxx +++ b/src/CharClassify.cxx @@ -14,11 +14,6 @@ using namespace Scintilla; #endif -// Shut up annoying Visual C++ warnings: -#ifdef _MSC_VER -#pragma warning(disable: 4514) -#endif - CharClassify::CharClassify() { SetDefaultCharClasses(true); } diff --git a/src/RESearch.cxx b/src/RESearch.cxx index 81eddf013..1958773cb 100644 --- a/src/RESearch.cxx +++ b/src/RESearch.cxx @@ -207,11 +207,6 @@ #include "CharClassify.h" #include "RESearch.h" -// Shut up annoying Visual C++ warnings: -#ifdef _MSC_VER -#pragma warning(disable: 4514) -#endif - #ifdef SCI_NAMESPACE using namespace Scintilla; #endif |