compilerplugins/clang/sallogareas.cxx | 6 +++---
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 294ad90704b7b19aa64c26bfa83442a96a31e57b
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Apr 24 11:42:09 2013 +0300
Update location of log-areas.dox
Change-Id: If54a3d7047f13ae9c9345c21737a89afee645403
diff --git a/compilerplugins/clang/sallogareas.cxx
b/compilerplugins/clang/sallogareas.cxx
index 7ce64bc..0724ca7 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -20,7 +20,7 @@ namespace loplugin
/*
This is a compile check.
-Check area used in SAL_INFO/SAL_WARN macros against the list in
sal/inc/sal/log-areas.dox and
+Check area used in SAL_INFO/SAL_WARN macros against the list in
include/sal/log-areas.dox and
report if the area is not listed there. The fix is either use a proper area or
add it to the list
if appropriate.
*/
@@ -104,14 +104,14 @@ void SalLogAreas::checkArea( StringRef area,
SourceLocation location )
readLogAreas();
if( !logAreas.count( area ))
{
- report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or
extend sal/inc/sal/log-areas.dox)",
+ report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or
extend include/sal/log-areas.dox)",
location ) << area;
}
}
void SalLogAreas::readLogAreas()
{
- ifstream is( SRCDIR "/sal/inc/sal/log-areas.dox" );
+ ifstream is( SRCDIR "/include/sal/log-areas.dox" );
while( is.good())
{
string line;
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index f0c7c44..e6c2ee6 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -163,7 +163,7 @@ gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang
--scope=$(UPDATE_FIL
endif
endif
# extra EF variable to make the command line shorter (just like is done with
$(SRCDIR) etc.)
-gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/sal/inc/sal/log-areas.dox &&
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
+gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/include/sal/log-areas.dox &&
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF
else
gb_COMPILER_PLUGINS :=
gb_COMPILER_PLUGINS_SETUP :=
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
