summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-15 19:13:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-17 09:05:38 +0200
commit206b5b2661be37efdff3c6aedb6f248c4636be79 (patch)
treeaf385e5b4725dcfea23988d9113cced8e9ccaf3c /testtools
parenta85d3ba1c0de313b60324b9ecfa488bb99d69d06 (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 'testtools')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx6
-rw-r--r--testtools/source/bridgetest/cppobj.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 6ef7367ffdc2..990d7d3b729e 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -71,7 +71,7 @@ using namespace test::testtools::bridgetest;
namespace bridge_test
{
template<typename T, typename U = T>
-Sequence<T> cloneSequence(const Sequence<T>& val);
+static Sequence<T> cloneSequence(const Sequence<T>& val);
inline static Sequence< OUString > getSupportedServiceNames()
@@ -998,7 +998,7 @@ static bool raiseException( const Reference< XBridgeTest > & xLBT )
/* Returns an acquired sequence
*/
-uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type)
+static uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type)
{
TypeDescription td(type);
td.makeComplete();
@@ -1045,7 +1045,7 @@ Sequence<T> cloneSequence(const Sequence<T>& val)
}
template< class T >
-inline bool makeSurrogate(
+static inline bool makeSurrogate(
Reference< T > & rOut, Reference< T > const & rOriginal )
{
rOut.clear();
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 2e646bfb5a18..dc5880c1b71c 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -622,11 +622,11 @@ void Test_Impl::raiseRuntimeExceptionOneway( const OUString & rMsg, const Refere
throw aExc;
}
-void dothrow2(const RuntimeException& e)
+static void dothrow2(const RuntimeException& e)
{
throw e;
}
-void dothrow(const RuntimeException& e)
+static void dothrow(const RuntimeException& e)
{
#if defined _MSC_VER
// currently only for MSVC: