compilerplugins/clang/checkconfigmacros.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 06312f82e635f9a279751a388506cf26502c5222 Author: Stephan Bergmann <[email protected]> Date: Wed Jul 24 10:23:44 2013 +0200 Adapt to PPCallbacks.h changes on Clang trunk towards 3.4 Change-Id: I5611ffd36f9c6d1560a6ada6118a1efaeb6dc522 diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx index 86b7e43..2377f8f 100644 --- a/compilerplugins/clang/checkconfigmacros.cxx +++ b/compilerplugins/clang/checkconfigmacros.cxx @@ -43,7 +43,11 @@ class CheckConfigMacros virtual void MacroUndefined( 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; +#if __clang_major__ == 3 && __clang_minor__ < 4 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 private: void checkMacro( const Token& macroToken, SourceLocation location ); @@ -109,8 +113,10 @@ void CheckConfigMacros::Ifndef( SourceLocation location, const Token& macroToken #if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 3 void CheckConfigMacros::Defined( const Token& macroToken ) -#else +#elif __clang_major__ == 3 && __clang_minor__ < 4 void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* ) +#else +void CheckConfigMacros::Defined( const Token& macroToken, const MacroDirective* , SourceRange ) #endif { checkMacro( macroToken, macroToken.getLocation()); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
