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 /vcl/source/image/ImplImageTree.cxx | |
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 'vcl/source/image/ImplImageTree.cxx')
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index fd1025dec240..af5329ec379e 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -332,7 +332,7 @@ bool ImplImageTree::loadImage(OUString const & rName, OUString const & rStyle, B return false; } -OUString createVariant(ImageRequestParameters& rParameters) +static OUString createVariant(ImageRequestParameters& rParameters) { bool bConvertToDarkTheme = rParameters.convertToDarkTheme(); sal_Int32 aScalePercentage = rParameters.scalePercentage(); @@ -345,7 +345,7 @@ OUString createVariant(ImageRequestParameters& rParameters) return aVariant; } -bool loadDiskCachedVersion(OUString const & sVariant, ImageRequestParameters& rParameters) +static bool loadDiskCachedVersion(OUString const & sVariant, ImageRequestParameters& rParameters) { OUString sUrl(getIconCacheUrl(rParameters.msStyle, sVariant, rParameters.msName)); if (!urlExists(sUrl)) @@ -357,7 +357,7 @@ bool loadDiskCachedVersion(OUString const & sVariant, ImageRequestParameters& rP return true; } -void cacheBitmapToDisk(OUString const & sVariant, ImageRequestParameters const & rParameters) +static void cacheBitmapToDisk(OUString const & sVariant, ImageRequestParameters const & rParameters) { OUString sUrl(createIconCacheUrl(rParameters.msStyle, sVariant, rParameters.msName)); vcl::PNGWriter aWriter(rParameters.mrBitmap); |