diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 10:28:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-09 14:47:17 +0200 |
commit | 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (patch) | |
tree | 616ab419fe0f01e94740de7faacb393775420589 /filter | |
parent | 664db0d945fbb23e115eeea8377e3a4e88541da1 (diff) |
Extend loplugin:redundantinline to catch inline functions w/o external linkage
...where "inline" (in its meaning of "this function can be defined in multiple
translation units") thus doesn't make much sense. (As discussed in
compilerplugins/clang/redundantinline.cxx, exempt such "static inline" functions
in include files for now.)
All the rewriting has been done automatically by the plugin, except for one
instance in sw/source/ui/frmdlg/column.cxx that used to involve an #if), plus
some subsequent solenv/clang-format/reformat-formatted-files.
Change-Id: Ib8b996b651aeafc03bbdc8890faa05ed50517224
Reviewed-on: https://gerrit.libreoffice.org/61573
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfreprd.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/countryid.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/mscodec.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx index 636d9197153c..d9254f5a1c9e 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx @@ -442,11 +442,11 @@ void DXFRepresentation::CalcBoundingBox(const DXFEntities & rEntities, } namespace { - inline bool lcl_isDec(sal_Unicode ch) + bool lcl_isDec(sal_Unicode ch) { return ch >= L'0' && ch <= L'9'; } - inline bool lcl_isHex(sal_Unicode ch) + bool lcl_isHex(sal_Unicode ch) { return lcl_isDec(ch) || (ch >= L'A' && ch <= L'F') || (ch >= L'a' && ch <= L'f'); } diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index 2f63c4631f53..1ffe69ae94a8 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -268,10 +268,10 @@ struct CountryEntryPred_Language explicit CountryEntryPred_Language( LanguageType eLanguage ) : meLanguage( eLanguage ) {} - inline bool operator()( const CountryEntry& rCmp ) const; + bool operator()( const CountryEntry& rCmp ) const; }; -inline bool CountryEntryPred_Language::operator()( const CountryEntry& rCmp ) const +bool CountryEntryPred_Language::operator()( const CountryEntry& rCmp ) const { // rCmp.mbUseSubLang==true -> compare full language type // rCmp.mbUseSubLang==false -> compare primary language only diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 9200cce2ca8d..b99e6cc4d63c 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -44,7 +44,7 @@ namespace { /** Rotates rnValue left by nBits bits. */ template< typename Type > -inline void lclRotateLeft( Type& rnValue, int nBits ) +void lclRotateLeft( Type& rnValue, int nBits ) { OSL_ASSERT( nBits >= 0 && @@ -54,7 +54,7 @@ inline void lclRotateLeft( Type& rnValue, int nBits ) /** Rotates the lower nWidth bits of rnValue left by nBits bits. */ template< typename Type > -inline void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth ) +void lclRotateLeft( Type& rnValue, sal_uInt8 nBits, sal_uInt8 nWidth ) { OSL_ASSERT( (nBits < nWidth) && (nWidth < sizeof( Type ) * 8) ); Type nMask = static_cast< Type >( (1UL << nWidth) - 1 ); @@ -289,7 +289,7 @@ static void lcl_PrintDigest(const sal_uInt8* pDigest, const char* msg) printf("\n"); } #else -static inline void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/) +static void lcl_PrintDigest(const sal_uInt8* /*pDigest*/, const char* /*msg*/) { } #endif |