Kaydet (Commit) 4f6563b5 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
üst b9a25096
...@@ -37,7 +37,11 @@ class CheckConfigMacros ...@@ -37,7 +37,11 @@ class CheckConfigMacros
explicit CheckConfigMacros( const InstantiationData& data ); explicit CheckConfigMacros( const InstantiationData& data );
virtual void run() override; virtual void run() override;
virtual void MacroDefined( const Token& macroToken, const MacroDirective* info ) 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 Ifdef( SourceLocation location, const Token& macroToken, compat::MacroDefinitionParam ) override;
virtual void Ifndef( 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; virtual void Defined( const Token& macroToken, compat::MacroDefinitionParam, SourceRange Range ) override;
...@@ -71,7 +75,11 @@ void CheckConfigMacros::MacroDefined( const Token& macroToken, const MacroDirect ...@@ -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()); configMacros.erase( macroToken.getIdentifierInfo()->getName());
} }
......
...@@ -59,7 +59,11 @@ private: ...@@ -59,7 +59,11 @@ private:
} }
void MacroUndefined( 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(); auto id = MacroNameTok.getIdentifierInfo()->getName();
if (id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN") { if (id == "OSL_BIGENDIAN" || id == "OSL_LITENDIAN") {
......
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