Kaydet (Commit) 06312f82 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Adapt to PPCallbacks.h changes on Clang trunk towards 3.4

Change-Id: I5611ffd36f9c6d1560a6ada6118a1efaeb6dc522
üst 7fd81244
...@@ -43,7 +43,11 @@ class CheckConfigMacros ...@@ -43,7 +43,11 @@ class CheckConfigMacros
virtual void MacroUndefined( const Token& macroToken, const MacroDirective* info ) override; virtual void MacroUndefined( const Token& macroToken, const MacroDirective* info ) override;
virtual void Ifdef( SourceLocation location, const Token& macroToken, const MacroDirective* info ) override; virtual void Ifdef( SourceLocation location, const Token& macroToken, const MacroDirective* info ) override;
virtual void Ifndef( SourceLocation location, const Token& macroToken, const MacroDirective* info ) override; virtual void Ifndef( SourceLocation location, const Token& macroToken, const MacroDirective* info ) override;
#if __clang_major__ == 3 && __clang_minor__ < 4
virtual void Defined( const Token& macroToken, const MacroDirective* info ) override; virtual void Defined( const Token& macroToken, const MacroDirective* info ) override;
#else
virtual void Defined( const Token& macroToken, const MacroDirective* info, SourceRange Range ) override;
#endif
#endif #endif
private: private:
void checkMacro( const Token& macroToken, SourceLocation location ); void checkMacro( const Token& macroToken, SourceLocation location );
...@@ -109,8 +113,10 @@ void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken ...@@ -109,8 +113,10 @@ void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken
#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3 #if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3
void CheckConfigMacros::Defined( const Token& macroToken ) void CheckConfigMacros::Defined( const Token& macroToken )
#else #elif __clang_major__ == 3 && __clang_minor__ < 4
void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* ) void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* )
#else
void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* , SourceRange )
#endif #endif
{ {
checkMacro( macroToken, macroToken.getLocation()); checkMacro( macroToken, macroToken.getLocation());
......
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