diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-15 19:13:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-17 09:05:38 +0200 |
commit | 206b5b2661be37efdff3c6aedb6f248c4636be79 (patch) | |
tree | af385e5b4725dcfea23988d9113cced8e9ccaf3c /unotools/source/config | |
parent | a85d3ba1c0de313b60324b9ecfa488bb99d69d06 (diff) |
New loplugin:external
...warning about (for now only) functions and variables with external linkage
that likely don't need it.
The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
returns 1, both moving just the struct S2 into an nunnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
namespace { struct S2: S1 { int f() { return 1; } }; }
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
as well as moving just the function f overload into an unnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
namespace { int f(S2 s) { return s.f(); } }
}
int main() { return f(N::S2()); }
would each change the program to return 0 instead.
Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/configvaluecontainer.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/defaultoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/optionsdlg.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 3aec56767f60..894e665cf9fc 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -85,9 +85,7 @@ namespace utl aDataType = _rType; } - #ifndef UNX static - #endif void lcl_copyData( const NodeValueAccessor& _rAccessor, const Any& _rData, ::osl::Mutex& _rMutex ) { ::osl::MutexGuard aGuard( _rMutex ); @@ -118,9 +116,7 @@ namespace utl } } - #ifndef UNX static - #endif void lcl_copyData( Any& _rData, const NodeValueAccessor& _rAccessor, ::osl::Mutex& _rMutex ) { ::osl::MutexGuard aGuard( _rMutex ); diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 0a74a321825a..259cbef80702 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -147,7 +147,7 @@ static PathToDefaultMapping_Impl const PathMap_Impl[] = // functions ------------------------------------------------------------- -Sequence< OUString > GetDefaultPropertyNames() +static Sequence< OUString > GetDefaultPropertyNames() { static const char* aPropNames[] = { diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index a8a28b002ce5..535ad64b870b 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -161,15 +161,15 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp } } -OUString getGroupPath( const OUString& _rGroup ) +static OUString getGroupPath( const OUString& _rGroup ) { return OUString( ROOT_NODE "/" + _rGroup + "/" ); } -OUString getPagePath( const OUString& _rPage ) +static OUString getPagePath( const OUString& _rPage ) { return OUString( PAGES_NODE "/" + _rPage + "/" ); } -OUString getOptionPath( const OUString& _rOption ) +static OUString getOptionPath( const OUString& _rOption ) { return OUString( OPTIONS_NODE "/" + _rOption + "/" ); } diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 85258c7b3cfd..19a39049e6bc 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -337,7 +337,7 @@ bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const #define SAVEWORKINGSET 13 #define ODFDEFAULTVERSION 14 -Sequence< OUString > GetPropertyNames() +static Sequence< OUString > GetPropertyNames() { static const char* aPropNames[] = { |