# HG changeset patch
# User timkelly
# Date 1251399723 18000
# Node ID f17d142f8a47b9c07d8f2926a06678a1b22065ea
# Parent  2d52d49686f6ace6d9ed67d52340c16227a8c28b# Parent  458fc58586935027dfcade12a2dbd9293374a288
merge commit

diff -r 458fc5858693 -r f17d142f8a47 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	Thu Aug 27 11:35:06 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/GCCErrorParser.java	Thu Aug 27 14:02:03 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, 5, 0, 0) {
+		new ErrorPattern(Messages.GCCErrorParser_Warnings, 1, 2, 6, 0, 0) {
 			@Override
 			public String getVarName(Matcher matcher) {
 				String desc = getDesc(matcher);
@@ -53,7 +53,7 @@
 			@Override
 			public int getSeverity(Matcher matcher) {
 				String warningGroup = matcher.group(4);
-				if (warningGroup != null && warningGroup.toLowerCase().endsWith("warning")) { //$NON-NLS-1$
+				if (warningGroup != null && warningGroup.toLowerCase().endsWith("warning:")) { //$NON-NLS-1$
 					return IMarkerGenerator.SEVERITY_WARNING;
 				}
 				
diff -r 458fc5858693 -r f17d142f8a47 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	Thu Aug 27 11:35:06 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/messages.properties	Thu Aug 27 14:02:03 2009 -0500
@@ -16,7 +16,7 @@
 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:))? (.*)
 GLDErrorParser_error_text=(.*)\\(\\.text\\+.*\\): (.*)
 GLDErrorParser_warning_general=ld(\\.exe)?: [Ww]arning:? (.*)
 GLDErrorParser_error_general=ld(\\.exe)?: (.*)