diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/angle/src/compiler/preprocessor/Macro.h | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/3rdparty/angle/src/compiler/preprocessor/Macro.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/preprocessor/Macro.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/3rdparty/angle/src/compiler/preprocessor/Macro.h b/src/3rdparty/angle/src/compiler/preprocessor/Macro.h index 31ee22c26a..c42e172ef9 100644 --- a/src/3rdparty/angle/src/compiler/preprocessor/Macro.h +++ b/src/3rdparty/angle/src/compiler/preprocessor/Macro.h @@ -8,6 +8,7 @@ #define COMPILER_PREPROCESSOR_MACRO_H_ #include <map> +#include <memory> #include <string> #include <vector> @@ -26,16 +27,13 @@ struct Macro typedef std::vector<std::string> Parameters; typedef std::vector<Token> Replacements; - Macro() - : predefined(false), - disabled(false), - type(kTypeObj) - { - } + Macro(); + ~Macro(); bool equals(const Macro &other) const; bool predefined; mutable bool disabled; + mutable int expansionCount; Type type; std::string name; @@ -43,7 +41,7 @@ struct Macro Replacements replacements; }; -typedef std::map<std::string, Macro> MacroSet; +typedef std::map<std::string, std::shared_ptr<Macro>> MacroSet; void PredefineMacro(MacroSet *macroSet, const char *name, int value); |