summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-01-30 14:23:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-01-30 16:25:15 +0100
commitd0265c128c5c2c7d12e2f955ccb02aa255a2bf3c (patch)
tree0560183165036f1c0f53959deadd51c85d6ab19b /setup_native
parent9e8f11a722ee9cba37c4692a6ab7d74536261429 (diff)
loplugin:redundantinline (clang-cl)
Change-Id: Ib6320ddc049e93cca4c5931ad28d1873d34bd8b4 Reviewed-on: https://gerrit.libreoffice.org/67137 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/quickstarter/quickstarter.cxx2
-rw-r--r--setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkpatches.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/upgrade.cxx4
-rw-r--r--setup_native/source/win32/customactions/tools/checkversion.cxx2
-rw-r--r--setup_native/source/win32/customactions/tools/seterror.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
index 9581ce32f008..7b0f9a5bd18d 100644
--- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
@@ -86,7 +86,7 @@ std::wstring GetQuickstarterLinkNameW(MSIHANDLE handle)
return quickstarterlinkname;
}
-static inline bool IsValidHandle( HANDLE handle )
+static bool IsValidHandle( HANDLE handle )
{
return nullptr != handle && INVALID_HANDLE_VALUE != handle;
}
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index f8be58bcdcda..b1ffb6976c87 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -84,7 +84,7 @@ inline void OutputDebugStringFormatW( LPCWSTR pFormat, ... )
va_end(args);
}
#else
-static inline void OutputDebugStringFormatW( LPCWSTR, ... )
+static void OutputDebugStringFormatW( LPCWSTR, ... )
{
}
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 836b3e655e75..0a879dc1b80e 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -33,7 +33,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
va_end(args);
}
#else
-static inline void OutputDebugStringFormatW( PCWSTR, ... )
+static void OutputDebugStringFormatW( PCWSTR, ... )
{
}
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
index 3b5262ca9826..494cfaedad91 100644
--- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
@@ -93,12 +93,12 @@ namespace
return convertedGuid;
}
- inline bool IsSetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty)
+ bool IsSetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty)
{
return (GetMsiPropertyW(handle, sProperty).length() > 0);
}
- inline void SetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty)
+ void SetMsiPropertyW(MSIHANDLE handle, const std::wstring& sProperty)
{
MsiSetPropertyW(handle, sProperty.c_str(), L"1");
}
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 80e56be0cdb1..ffb7a8aa4216 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -60,7 +60,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
va_end(args);
}
#else
-static inline void OutputDebugStringFormatW( PCWSTR, ... )
+static void OutputDebugStringFormatW( PCWSTR, ... )
{
}
#endif
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx
index e0c4389fd1a7..f1800ffb7ffb 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -40,7 +40,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
va_end(args);
}
#else
-static inline void OutputDebugStringFormatW( PCWSTR, ... )
+static void OutputDebugStringFormatW( PCWSTR, ... )
{
}
#endif