summaryrefslogtreecommitdiff
path: root/cppu
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 /cppu
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 'cppu')
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx2
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx2
-rw-r--r--cppu/source/threadpool/current.cxx6
3 files changed, 7 insertions, 3 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 3919ed6c17ef..c95c61a905b3 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -367,7 +367,7 @@
namespace test { namespace codemaker { namespace cppumaker {
-bool operator ==(
+static bool operator ==(
test::codemaker::cppumaker::TestException1 const & e1,
test::codemaker::cppumaker::TestException1 const & e2)
{
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 395d7d8ef164..da8b1e64e702 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -189,7 +189,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
}
}
-void LogProbe(
+static void LogProbe(
bool pre,
SAL_UNUSED_PARAMETER void * /*pThis*/,
SAL_UNUSED_PARAMETER void * /*pContext*/,
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index fa2545d05e1c..b5c839b193cd 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -134,7 +134,9 @@ public:
}
};
-extern "C" void delete_IdContainer( void * p )
+extern "C" {
+
+static void delete_IdContainer( void * p )
{
if (p)
{
@@ -155,6 +157,8 @@ extern "C" void delete_IdContainer( void * p )
}
}
+}
+
IdContainer * getIdContainer()
{
static ThreadKey s_key( delete_IdContainer );