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 /sw/source/filter/ww8/ww8scan.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 'sw/source/filter/ww8/ww8scan.cxx')
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index b8181307d82d..13c4999c0f46 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -838,33 +838,33 @@ SprmInfo wwSprmParser::GetSprmInfo(sal_uInt16 nId) const //-end -inline sal_uInt8 Get_Byte( sal_uInt8 *& p ) +static inline sal_uInt8 Get_Byte( sal_uInt8 *& p ) { sal_uInt8 n = *p; p += 1; return n; } -inline sal_uInt16 Get_UShort( sal_uInt8 *& p ) +static inline sal_uInt16 Get_UShort( sal_uInt8 *& p ) { const sal_uInt16 n = SVBT16ToShort( *reinterpret_cast<SVBT16*>(p) ); p += 2; return n; } -inline sal_Int16 Get_Short( sal_uInt8 *& p ) +static inline sal_Int16 Get_Short( sal_uInt8 *& p ) { return Get_UShort(p); } -inline sal_uInt32 Get_ULong( sal_uInt8 *& p ) +static inline sal_uInt32 Get_ULong( sal_uInt8 *& p ) { sal_uInt32 n = SVBT32ToUInt32( *reinterpret_cast<SVBT32*>(p) ); p += 4; return n; } -inline sal_Int32 Get_Long( sal_uInt8 *& p ) +static inline sal_Int32 Get_Long( sal_uInt8 *& p ) { return Get_ULong(p); } @@ -2592,12 +2592,12 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::Entry::operator< return (mnFC < rSecond.mnFC); } -bool IsReplaceAllSprm(sal_uInt16 nSpId) +static bool IsReplaceAllSprm(sal_uInt16 nSpId) { return (NS_sprm::LN_PHugePapx == nSpId || 0x6646 == nSpId); } -bool IsExpandableSprm(sal_uInt16 nSpId) +static bool IsExpandableSprm(sal_uInt16 nSpId) { return 0x646B == nSpId; } @@ -6608,7 +6608,7 @@ MSOFactoidType::MSOFactoidType() namespace MSOPBString { -OUString Read(SvStream& rStream) +static OUString Read(SvStream& rStream) { OUString aRet; @@ -6624,7 +6624,7 @@ OUString Read(SvStream& rStream) return aRet; } -void Write(const OUString& rString, SvStream& rStream) +static void Write(const OUString& rString, SvStream& rStream) { sal_uInt16 nBuf = 0; nBuf |= rString.getLength(); // cch, 0..14th bits. |