From 206b5b2661be37efdff3c6aedb6f248c4636be79 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 15 Sep 2018 19:13:19 +0200 Subject: 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 --- basegfx/source/polygon/b2dpolygonclipper.cxx | 2 +- basegfx/source/polygon/b2dpolygontools.cxx | 2 +- basegfx/source/polygon/b3dpolypolygontools.cxx | 2 +- basegfx/source/tools/gradienttools.cxx | 6 +++--- basegfx/source/tools/stringconversiontools.cxx | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'basegfx/source') diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index 5057fc52d977..f4b26f260972 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -552,7 +552,7 @@ namespace basegfx * outside |inside |intersect with clip plane follwed by next * */ - sal_uInt32 scissorLineSegment( ::basegfx::B2DPoint *in_vertex, // input buffer + static sal_uInt32 scissorLineSegment( ::basegfx::B2DPoint *in_vertex, // input buffer sal_uInt32 in_count, // number of verts in input buffer ::basegfx::B2DPoint *out_vertex, // output buffer scissor_plane const *pPlane, // scissoring plane diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 94590d7483a8..b5d2abf7e4be 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -1654,7 +1654,7 @@ namespace basegfx return createPolygonFromEllipse( rCenter, fRadius, fRadius ); } - B2DPolygon impCreateUnitCircle(sal_uInt32 nStartQuadrant) + static B2DPolygon impCreateUnitCircle(sal_uInt32 nStartQuadrant) { B2DPolygon aUnitCircle; const double fKappa((M_SQRT2 - 1.0) * 4.0 / 3.0); diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index 0130dd5d7081..f3975a7a51c0 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -223,7 +223,7 @@ namespace basegfx // helper for getting the 3D Point from given cartesian coordinates. fHor is defined from // [F_PI2 .. -F_PI2], fVer from [0.0 .. F_2PI] - inline B3DPoint getPointFromCartesian(double fHor, double fVer) + static inline B3DPoint getPointFromCartesian(double fHor, double fVer) { const double fCosVer(cos(fVer)); return B3DPoint(fCosVer * cos(fHor), sin(fVer), fCosVer * -sin(fHor)); diff --git a/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx index b05d9b219a53..082f564556a4 100644 --- a/basegfx/source/tools/gradienttools.cxx +++ b/basegfx/source/tools/gradienttools.cxx @@ -45,7 +45,7 @@ namespace basegfx /** Most of the setup for linear & axial gradient is the same, except for the border treatment. Factored out here. */ - ODFGradientInfo init1DGradientInfo( + static ODFGradientInfo init1DGradientInfo( const B2DRange& rTargetRange, sal_uInt32 nSteps, double fBorder, @@ -115,7 +115,7 @@ namespace basegfx /** Most of the setup for radial & ellipsoidal gradient is the same, except for the border treatment. Factored out here. */ - ODFGradientInfo initEllipticalGradientInfo( + static ODFGradientInfo initEllipticalGradientInfo( const B2DRange& rTargetRange, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -184,7 +184,7 @@ namespace basegfx /** Setup for rect & square gradient is exactly the same. Factored out here. */ - ODFGradientInfo initRectGradientInfo( + static ODFGradientInfo initRectGradientInfo( const B2DRange& rTargetRange, const B2DVector& rOffset, sal_uInt32 nSteps, diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx index b14fce0fb557..6e48c22b1f89 100644 --- a/basegfx/source/tools/stringconversiontools.cxx +++ b/basegfx/source/tools/stringconversiontools.cxx @@ -35,7 +35,7 @@ namespace basegfx } } - void skipSpacesAndCommas(sal_Int32& io_rPos, + static void skipSpacesAndCommas(sal_Int32& io_rPos, const OUString& rStr, const sal_Int32 nLen) { @@ -46,7 +46,7 @@ namespace basegfx } } - bool getDoubleChar(double& o_fRetval, + static bool getDoubleChar(double& o_fRetval, sal_Int32& io_rPos, const OUString& rStr) { -- cgit