commit 7f2d7945ee702241829727751bd4c7424662b225
author Shannon Woods <shannonwoods@chromium.org> Tue Nov 19 15:07:58 2013 -0500
committer Shannon Woods <shannonwoods@chromium.org> Tue Nov 19 15:07:58 2013 -0500
tree 210b5d47d1c74f6967a0fbeb395807d765b395f3
parent 91db708c4e783a0891c4b04f630c278a4ef2b6dc

Manual merge of Ehsan Akhgari's patch to rename Diagnostics enums to avoid collision with Windows.h

(See https://chromium-review.googlesource.com/#/c/177181/3)

Change-Id: I2978d06ec96789b3ee1696b65a84c2a9f31f7ba4

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 218bc28..a2e5d89 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -182,7 +182,7 @@
     pp::SourceLocation srcLoc;
     srcLoc.file = loc.first_file;
     srcLoc.line = loc.first_line;
-    diagnostics.writeInfo(pp::Diagnostics::ERROR,
+    diagnostics.writeInfo(pp::Diagnostics::PP_ERROR,
                           srcLoc, reason, token, extraInfo);
 
 }
@@ -193,7 +193,7 @@
     pp::SourceLocation srcLoc;
     srcLoc.file = loc.first_file;
     srcLoc.line = loc.first_line;
-    diagnostics.writeInfo(pp::Diagnostics::WARNING,
+    diagnostics.writeInfo(pp::Diagnostics::PP_WARNING,
                           srcLoc, reason, token, extraInfo);
 }