mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[API CHANGE] Drop OSL_THIS_FUNC, directly use C++11 __func__

Browse Source 
It had been documented as "the macro OSL_THIS_FUNC is intended to be an office
internal macro for now", so take the liberty of removing it, even if technically
that can be considered an incompatible API change.

Change-Id: I7580a932e1da54845934378a650e894f3f3a9062
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-08-26 15:44:06 +02:00
parent d84e590486
commit e5356fb099
41 changed files with 190 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
compilerplugins/clang/stringconstant.cxx
View File

@@ -895,17 +895,6 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
{
return true;
}
// OSL_THIS_FUNC may be defined as "" or as something other
// than a string literal in include/osl/diagnose.h:
auto loc = compat::getBeginLoc(arg);
if (compiler.getSourceManager().isMacroBodyExpansion(loc)
&& (Lexer::getImmediateMacroName(
loc, compiler.getSourceManager(),
compiler.getLangOpts())
== "OSL_THIS_FUNC"))
{
return true;
}
if (cont != ContentKind::Ascii) {
report(
DiagnosticsEngine::Warning,
@@ -1198,15 +1187,6 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
loc = compiler.getSourceManager()
.getImmediateMacroCallerLoc(loc);
}
if ((compiler.getSourceManager()
.isMacroBodyExpansion(loc))
&& (Lexer::getImmediateMacroName(
loc, compiler.getSourceManager(),
compiler.getLangOpts())
== "OSL_THIS_FUNC"))
{
return true;
}
if (kind == ChangeKind::SingleChar) {
report(
DiagnosticsEngine::Warning,