Fixed compile error in the new preprocessor due to the change…

Fixed compile error in the new preprocessor due to the change Preprocessor::predefineMacro() interface. git-svn-id: https://angleproject.googlecode.com/svn/trunk@1160 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed compile error in the new preprocessor due to the change…
e3043b14 · alokp@chromium.org · b197c885 · e3043b14 · e3043b14
Commit e3043b14 authored Jun 19, 2012 by alokp@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

glslang.l src/compiler/glslang.l +1 -1

glslang_lex.cpp src/compiler/glslang_lex.cpp +1 -1

No files found.
--- a/src/compiler/glslang.l
+++ b/src/compiler/glslang.l
@@ -503,7 +503,7 @@ int glslang_scan(int count, const char* const string[], const int length[],
    for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
         iter != extBehavior.end(); ++iter) {
 #if ANGLE_USE_NEW_PREPROCESSOR
-        context->preprocessor.predefineMacro(iter->first, 1);
+        context->preprocessor.predefineMacro(iter->first.c_str(), 1);
 #else
        PredefineIntMacro(iter->first.c_str(), 1);
 #endif

--- a/src/compiler/glslang_lex.cpp
+++ b/src/compiler/glslang_lex.cpp
@@ -3179,7 +3179,7 @@ int glslang_scan(int count, const char* const string[], const int length[],
    for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
         iter != extBehavior.end(); ++iter) {
 #if ANGLE_USE_NEW_PREPROCESSOR
-        context->preprocessor.predefineMacro(iter->first, 1);
+        context->preprocessor.predefineMacro(iter->first.c_str(), 1);
 #else
        PredefineIntMacro(iter->first.c_str(), 1);
 #endif