diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-15 15:58:56 +0200 |
| commit | ad9498f8b888f7851a8612b8d654a2bc89005925 (patch) | |
| tree | ff7e98ce301121fdddf44f2fc8cb42bd2b1fac4f /xmlhelp | |
| parent | eea16cb3e65a4308caddb7618d31a76ca259dbb1 (diff) | |
More -Werror,-Wunused-private-field
...detected with a modified trunk Clang with
> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp (revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp (working copy)
> @@ -1917,9 +1917,10 @@
> const Type *T = FD.getType()->getBaseElementTypeUnsafe();
> // FIXME: Destruction of ObjC lifetime types has side-effects.
> if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> - return !RD->isCompleteDefinition() ||
> - !RD->hasTrivialDefaultConstructor() ||
> - !RD->hasTrivialDestructor();
> + return !RD->hasAttr<WarnUnusedAttr>() &&
> + (!RD->isCompleteDefinition() ||
> + !RD->hasTrivialDefaultConstructor() ||
> + !RD->hasTrivialDestructor());
> return false;
> }
>
> @@ -3517,9 +3518,11 @@
> bool addFieldInitializer(CXXCtorInitializer *Init) {
> AllToInit.push_back(Init);
>
> +#if 0
> // Check whether this initializer makes the field "used".
> if (Init->getInit()->HasSideEffects(S.Context))
> S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
> return false;
> }
to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").
Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 685525daf4d7..825b1ee5d790 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -161,7 +161,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte } pQueryResultVector->reserve( hitCount ); - OUString aLang = m_aURLParameter.get_language(); const std::vector< OUString >& aListItem = queryList[i]; OUString aNewQueryStr = aListItem[0]; @@ -170,7 +169,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte try { - HelpSearch searcher(aLang, idxDir); + HelpSearch searcher(idxDir); searcher.query(aNewQueryStr, bCaptionsOnly, aPathVector, aScoreVector); } catch (CLuceneError &e) |