# HG changeset patch
# User timkelly
# Date 1253542713 18000
# Node ID ce57c204ca6b401fb43184377e171eeb3a1bf4db
# Parent  defec9d2b40ac79efcd10e612b0140d52b87c28c
fix for cdt bug 263987 (slightly different from our proposal but just as effective)

diff -r defec9d2b40a -r ce57c204ca6b cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Tue Sep 15 10:25:52 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Mon Sep 21 09:18:33 2009 -0500
@@ -36,7 +36,7 @@
 		new ErrorPattern(Messages.GCCErrorParser_skip_note),
 		new ErrorPattern(Messages.GCCErrorParser_sikp_instantiatedFromHere),
 		// The following are not...
-		new ErrorPattern(Messages.GCCErrorParser_Warnings, 1, 2, 6, 0, 0) {
+		new ErrorPattern(Messages.GCCErrorParser_Warnings, 1, 2, 5, 0, 0) {
 			@Override
 			public String getVarName(Matcher matcher) {
 				String desc = getDesc(matcher);
diff -r defec9d2b40a -r ce57c204ca6b cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Tue Sep 15 10:25:52 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Mon Sep 21 09:18:33 2009 -0500
@@ -16,7 +16,8 @@
 GCCErrorParser_skip_forEachFunction=for each function it appears in.\\)
 GCCErrorParser_skip_note=: note:
 GCCErrorParser_sikp_instantiatedFromHere=instantiated from 
-GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?( (.*[Ww]arning:|WARNING:|[Ee]rror:))? (.*)
+#GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?( (.*[Ww]arning:|WARNING:|[Ee]rror:))? (.*)
+GCCErrorParser_Warnings=(.*?):([0-9]+):([0-9]+:)?(.*?[([Ww]arning)(WARNING)([Ee]rror)]:)? (.*)
 GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*)
 GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*)
 GLDErrorParser_error_general=ld(\\.exe)?: (.*)