Skip to content

A
angle
Commit 2dc8bf8b by Jamie Madill
Options

translator: Fix C++11-deprecated register usage.

Define 'register' as an empty string if we're in a modern version of C++. BUG=255186 BUG=angleproject:463 Change-Id: Ied044fb87a9b05c91cb419c54295c39f0f0ab776 Reviewed-on: https://chromium-review.googlesource.com/268512Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent b96687df
Showing with 28 additions and 0 deletions
src/compiler/preprocessor/Tokenizer.cpp
...@@ -552,6 +552,13 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh. ...@@ -552,6 +552,13 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
#pragma warning(disable: 4244) #pragma warning(disable: 4244)
#endif #endif
// Workaround for flex using the register keyword, deprecated in C++11.
#ifdef __cplusplus
#if __cplusplus > 199711L
#define register
#endif
#endif
typedef std::string YYSTYPE; typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE; typedef pp::SourceLocation YYLTYPE;
......
src/compiler/preprocessor/Tokenizer.l
...@@ -35,6 +35,13 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh. ...@@ -35,6 +35,13 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
#pragma warning(disable: 4244) #pragma warning(disable: 4244)
#endif #endif
// Workaround for flex using the register keyword, deprecated in C++11.
#ifdef __cplusplus
#if __cplusplus > 199711L
#define register
#endif
#endif
typedef std::string YYSTYPE; typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE; typedef pp::SourceLocation YYLTYPE;
......
src/compiler/translator/glslang.l
...@@ -51,6 +51,13 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp). ...@@ -51,6 +51,13 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
#pragma warning(disable : 4102) #pragma warning(disable : 4102)
#endif #endif
// Workaround for flex using the register keyword, deprecated in C++11.
#ifdef __cplusplus
#if __cplusplus > 199711L
#define register
#endif
#endif
#define YY_USER_ACTION \ #define YY_USER_ACTION \
yylloc->first_file = yylloc->last_file = yycolumn; \ yylloc->first_file = yylloc->last_file = yycolumn; \
yylloc->first_line = yylloc->last_line = yylineno; yylloc->first_line = yylloc->last_line = yylineno;
......
src/compiler/translator/glslang_lex.cpp
...@@ -1034,6 +1034,13 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp). ...@@ -1034,6 +1034,13 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
#pragma warning(disable : 4102) #pragma warning(disable : 4102)
#endif #endif
// Workaround for flex using the register keyword, deprecated in C++11.
#ifdef __cplusplus
#if __cplusplus > 199711L
#define register
#endif
#endif
#define YY_USER_ACTION \ #define YY_USER_ACTION \
yylloc->first_file = yylloc->last_file = yycolumn; \ yylloc->first_file = yylloc->last_file = yycolumn; \
yylloc->first_line = yylloc->last_line = yylineno; yylloc->first_line = yylloc->last_line = yylineno;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment