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 /jvmfwk | |
| 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 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/source/elements.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 77823293ef83..250a7655ffba 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -118,7 +118,7 @@ bool getSDKInfoFromRegistry(vector<OUString> & vecHome); bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome); #endif -bool decodeOutput(const OString& s, OUString* out); +static bool decodeOutput(const OString& s, OUString* out); namespace @@ -840,7 +840,7 @@ vector<OUString> getVectorFromCharArray(char const * const * ar, int size) In case of an error the returned string has the length 0. Otherwise the returned string is the "resolved" file URL. */ -OUString resolveDirPath(const OUString & path) +static OUString resolveDirPath(const OUString & path) { OUString ret; salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type | @@ -862,7 +862,7 @@ OUString resolveDirPath(const OUString & path) /** Checks if the path is a file. If it is a link to a file than it is resolved. */ -OUString resolveFilePath(const OUString & path) +static OUString resolveFilePath(const OUString & path) { OUString ret; salhelper::LinkResolver aResolver(osl_FileStatus_Mask_Type | diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 94b0ed7c2f39..b4eb74e03a03 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -48,7 +48,7 @@ using namespace osl; namespace jfw { -OString getElement(OString const & docPath, +static OString getElement(OString const & docPath, xmlChar const * pathExpression) { //Prepare the xml document and context |