summaryrefslogtreecommitdiff
path: root/include/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 13:39:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 17:18:38 +0100
commit2e83a62f15b564edfe7f585dd72fcb41058120b3 (patch)
treeb43e06c3a7867251813d876b5be32be3e7c32ebd /include/tools
parent7ce84d71b5a7e46bc4322997b1727b260e9b2cbd (diff)
Clean up LIBO_INTERNAL_ONLY uses of SAL_WARN_UNUSED_RESULT
Change-Id: I98b2d90c8345f07010f6defd82557188d5cd35c7 Reviewed-on: https://gerrit.libreoffice.org/64808 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/tools')
-rw-r--r--include/tools/helpers.hxx4
-rw-r--r--include/tools/stream.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index 2ce550c42e03..1d00bad7112e 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
@@ -78,7 +78,7 @@ inline long FRound( double fVal )
//valid range: (-180,180]
template <typename T>
-SAL_WARN_UNUSED_RESULT inline typename std::enable_if<std::is_signed<T>::value, T>::type
+[[nodiscard]] inline typename std::enable_if<std::is_signed<T>::value, T>::type
NormAngle180(T angle)
{
while (angle <= -180)
@@ -89,7 +89,7 @@ NormAngle180(T angle)
}
//valid range: [0,360)
-template <typename T> SAL_WARN_UNUSED_RESULT inline T NormAngle360(T angle)
+template <typename T> [[nodiscard]] inline T NormAngle360(T angle)
{
while (angle < 0)
angle += 360;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index ea3e53d21ff9..e4da2748a3ac 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -564,7 +564,7 @@ inline std::size_t write_uInt16_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
return write_uInt16_lenPrefixed_uInt8s_FromOString(rStrm, OUStringToOString(rStr, eEnc));
}
-SAL_WARN_UNUSED_RESULT TOOLS_DLLPUBLIC bool checkSeek(SvStream &rSt, sal_uInt64 nOffset);
+[[nodiscard]] TOOLS_DLLPUBLIC bool checkSeek(SvStream &rSt, sal_uInt64 nOffset);
// FileStream