diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-02 15:33:05 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-02 15:33:05 +0200 |
| commit | 4f6563b50856899eb52648a4d062f5df8d0491ce (patch) | |
| tree | 9e940c331bfdf7e90017ec7d2e4b933e44c4142c /compilerplugins | |
| parent | b9a25096e7e8a82c475c8cc5b6ec7b6c7cdad8a4 (diff) | |
Adapt to Clang 5 change of PPCallbacks::MacroUndefined signature
...since <http://llvm.org/viewvc/llvm-project?view=revision&revision=301449>
"PPCallbacks::MacroUndefined, change signature and add test."
Change-Id: I6a420dc4ca33607fef1356e8869cedee87192e93
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/checkconfigmacros.cxx | 12 | ||||
| -rw-r--r-- | compilerplugins/clang/oslendian.cxx | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx index 855755999a70..d35008c70c20 100644 --- a/compilerplugins/clang/checkconfigmacros.cxx +++ b/compilerplugins/clang/checkconfigmacros.cxx @@ -37,7 +37,11 @@ class CheckConfigMacros explicit CheckConfigMacros( const InstantiationData& data ); virtual void run() override; virtual void MacroDefined( const Token& macroToken, const MacroDirective* info ) override; - virtual void MacroUndefined( const Token& macroToken, compat::MacroDefinitionParam ) override; + virtual void MacroUndefined( const Token& macroToken, compat::MacroDefinitionParam +#if CLANG_VERSION >= 50000 + , MacroDirective const * +#endif + ) override; virtual void Ifdef( SourceLocation location, const Token& macroToken, compat::MacroDefinitionParam ) override; virtual void Ifndef( SourceLocation location, const Token& macroToken, compat::MacroDefinitionParam ) override; virtual void Defined( const Token& macroToken, compat::MacroDefinitionParam, SourceRange Range ) override; @@ -71,7 +75,11 @@ void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroDirect } } -void CheckConfigMacros::MacroUndefined( const Token& macroToken, compat::MacroDefinitionParam ) +void CheckConfigMacros::MacroUndefined( const Token& macroToken, compat::MacroDefinitionParam +#if CLANG_VERSION >= 50000 + , MacroDirective const * +#endif + ) { configMacros.erase( macroToken.getIdentifierInfo()->getName()); } diff --git a/compilerplugins/clang/oslendian.cxx b/compilerplugins/clang/oslendian.cxx index 705a7bcc987a..ce71c9cf39e1 100644 --- a/compilerplugins/clang/oslendian.cxx +++ b/compilerplugins/clang/oslendian.cxx @@ -59,7 +59,11 @@ private: } void MacroUndefined( - Token const & MacroNameTok, compat::MacroDefinitionParam) override + Token const & MacroNameTok, compat::MacroDefinitionParam +#if CLANG_VERSION >= 50000 + , MacroDirective const * +#endif + ) override { auto id = MacroNameTok.getIdentifierInfo()->getName(); if (id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN") { |