aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2013-09-10 13:20:50 +1000
committerNeil <nyamatongwe@gmail.com>2013-09-10 13:20:50 +1000
commit8972cd49a9cb27f21adcb99b5b12a3791de26c34 (patch)
tree170022e0f8dafb783dc3e6f2ffa6fcd85d6375ad
parentac108ca681666b9cc9ec5823284a4900c19287ac (diff)
downloadscintilla-mirror-8972cd49a9cb27f21adcb99b5b12a3791de26c34.tar.gz
Drop warning setting -Wno-missing-braces since this has had no effect since gcc 4.2.
-rw-r--r--gtk/makefile2
-rw-r--r--include/Platform.h1
-rw-r--r--win32/makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 3c2651ed4..0dbe55460 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -46,7 +46,7 @@ INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE
diff --git a/include/Platform.h b/include/Platform.h
index 311b1c423..f4cbc0538 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -530,7 +530,6 @@ public:
#if defined(__GNUC__) && defined(SCINTILLA_QT)
#pragma GCC diagnostic ignored "-Wmissing-braces"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wchar-subscripts"
#endif
#endif
diff --git a/win32/makefile b/win32/makefile
index 23f253255..159d66fdf 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -26,7 +26,7 @@ ifneq "$(shell g++ -c CheckD2D.cxx 2>&1)" ""
D2DFLAGS=-DDISABLE_D2D
endif
-CXXBASEFLAGS=--std=c++0x -Wall -Wno-missing-braces -Wno-char-subscripts -pedantic $(INCLUDEDIRS) -fno-rtti $(D2DFLAGS)
+CXXBASEFLAGS=--std=c++0x -Wall -Wno-missing-braces -pedantic $(INCLUDEDIRS) -fno-rtti $(D2DFLAGS)
ifdef DEBUG
CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS)