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 /scripting/source/provider | |
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 'scripting/source/provider')
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index d06833d7a6dd..56082753e864 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -56,7 +56,7 @@ using namespace ::sf_misc; namespace func_provider { -bool endsWith( const OUString& target, const OUString& item ) +static bool endsWith( const OUString& target, const OUString& item ) { sal_Int32 index = target.indexOf( item ); return index != -1 && @@ -709,14 +709,14 @@ Sequence< OUString > SAL_CALL MasterScriptProvider::getSupportedServiceNames( ) namespace scripting_runtimemgr { -Reference< XInterface > sp_create( +static Reference< XInterface > sp_create( const Reference< XComponentContext > & xCompC ) { return static_cast<cppu::OWeakObject *>(new ::func_provider::MasterScriptProvider( xCompC )); } -Sequence< OUString > sp_getSupportedServiceNames( ) +static Sequence< OUString > sp_getSupportedServiceNames( ) { OUString names[3]; @@ -728,20 +728,20 @@ Sequence< OUString > sp_getSupportedServiceNames( ) } -OUString sp_getImplementationName( ) +static OUString sp_getImplementationName( ) { return OUString( "com.sun.star.script.provider.MasterScriptProvider" ); } // ***** registration or ScriptingFrameworkURIHelper -Reference< XInterface > urihelper_create( +static Reference< XInterface > urihelper_create( const Reference< XComponentContext > & xCompC ) { return static_cast<cppu::OWeakObject *>( new ::func_provider::ScriptingFrameworkURIHelper( xCompC )); } -Sequence< OUString > urihelper_getSupportedServiceNames( ) +static Sequence< OUString > urihelper_getSupportedServiceNames( ) { OUString serviceNameList[] = { OUString( @@ -753,7 +753,7 @@ Sequence< OUString > urihelper_getSupportedServiceNames( ) return serviceNames; } -OUString urihelper_getImplementationName( ) +static OUString urihelper_getImplementationName( ) { return OUString( "com.sun.star.script.provider.ScriptURIHelper"); |