diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:04:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 15:40:59 +0100 |
| commit | a061abd3949f933e93c84f9f67f0700055a054f7 (patch) | |
| tree | e45371dab6f6bf14c82ce40dff836176aad48aa8 /include/sal | |
| parent | 5f8b6b09871ba1f1bd2b6f0aa9d1a9ce931fdc19 (diff) | |
HAVE_CPP_ATTRIBUTE_NODISCARD is always true now
...but for safety, leave the configure.ac check in for some longer.
Also, save removing now-redundant SAL_WARN_UNUSED_RESULT in internal code for a
follow-up commit.
Change-Id: Ibe30b51c5cc4abc270f955c7c40b59f268986672
Reviewed-on: https://gerrit.libreoffice.org/64771
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sal/types.h b/include/sal/types.h index 74d5c8886203..e2442ea6c998 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -292,7 +292,7 @@ typedef void * sal_Handle; Compilers that support a construct of this nature will emit a compile time warning on unchecked return value. */ -#if defined __cplusplus && HAVE_CPP_ATTRIBUTE_NODISCARD +#if defined LIBO_INTERNAL_ONLY && defined __cplusplus #define SAL_WARN_UNUSED_RESULT [[nodiscard]] #elif (defined __GNUC__ \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1))) \ |