diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-08-05 11:35:53 +0200 |
commit | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (patch) | |
tree | 985faf01c526763515731569fa01a99f4dbef36e /gfx/angle/src/compiler/preprocessor/ExpressionParser.h | |
parent | e0a8dcfed131ffa58a5e2cb1d30fe48c745c2fdc (diff) | |
parent | 559824514dc95e02fbe81f1786e6ac13ee8e9d55 (diff) | |
download | UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.gz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.lz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.tar.xz UXP-6bd66b1728eeddb058066edda740aaeb2ceaec23.zip |
Merge branch 'master' into js-modules
Diffstat (limited to 'gfx/angle/src/compiler/preprocessor/ExpressionParser.h')
-rwxr-xr-x | gfx/angle/src/compiler/preprocessor/ExpressionParser.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gfx/angle/src/compiler/preprocessor/ExpressionParser.h b/gfx/angle/src/compiler/preprocessor/ExpressionParser.h index 0f2901b87..841c67b61 100755 --- a/gfx/angle/src/compiler/preprocessor/ExpressionParser.h +++ b/gfx/angle/src/compiler/preprocessor/ExpressionParser.h @@ -7,8 +7,8 @@ #ifndef COMPILER_PREPROCESSOR_EXPRESSIONPARSER_H_ #define COMPILER_PREPROCESSOR_EXPRESSIONPARSER_H_ -#include "common/angleutils.h" -#include "compiler/preprocessor/DiagnosticsBase.h" +#include "DiagnosticsBase.h" +#include "pp_utils.h" namespace pp { @@ -16,7 +16,7 @@ namespace pp class Lexer; struct Token; -class ExpressionParser : angle::NonCopyable +class ExpressionParser { public: struct ErrorSettings @@ -34,6 +34,8 @@ class ExpressionParser : angle::NonCopyable bool *valid); private: + PP_DISALLOW_COPY_AND_ASSIGN(ExpressionParser); + Lexer *mLexer; Diagnostics *mDiagnostics; }; |