summaryrefslogtreecommitdiff
path: root/include/osl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-09-10 18:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-09-11 13:48:55 +0200
commit3b835b8d546ca16d7edcb06eda017e276383ea0f (patch)
tree4d691d7d4fb2756735da020cece19ee1171d9a85 /include/osl
parent3d39dad6d93c979ac64244ecb9acfbd8a5fbd6c6 (diff)
Use [[nodiscard]] in SAL_WARN_UNUSED_RESULT where available
...which required some lax placements of SAL_WARN_UNUSED_RESULT to be fixed. Also, Clang unfortunately is rather picky about the relative order of SAL_WARN_UNUSED_RESULT expanding to [[nodiscard]] and uses of the DLLPUBLIC macros (expanding to __attribute__(...) resp. __declspec(..) for clang-cl). Change-Id: Iae6ca36bef97f1864873aefdb5f05c7f5e045ad3 Reviewed-on: https://gerrit.libreoffice.org/60274 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/osl')
-rw-r--r--include/osl/file.h4
-rw-r--r--include/osl/file.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/osl/file.h b/include/osl/file.h
index 038631a86618..133b93de0c93 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -717,8 +717,8 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFile(
@see osl_openFile()
@see osl_getFilePos()
*/
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_setFilePos(
- oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT;
+SAL_WARN_UNUSED_RESULT SAL_DLLPUBLIC oslFileError SAL_CALL osl_setFilePos(
+ oslFileHandle Handle, sal_uInt32 uHow, sal_Int64 uPos );
/** Retrieve the current position of the internal pointer of an open file.
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index a85f5fc7aeb0..a154aa4f27bc 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -1015,7 +1015,7 @@ public:
@see getPos()
*/
- RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) SAL_WARN_UNUSED_RESULT
+ SAL_WARN_UNUSED_RESULT RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
{
return static_cast< RC >( osl_setFilePos( _pData, uHow, uPos ) );
}