[Libreoffice-commits] core.git: include/unoidl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 11 17:09:52 UTC 2018


 include/unoidl/unoidl.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 35efd72da5847a391fdba94a21ee2206ef7539c5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Sep 11 16:44:42 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Sep 11 19:09:28 2018 +0200

    clang-cl wants these the other way around
    
    (where SAL_WARN_UNUSED expands to a "real" [[nodiscard]] attribute since
    3b835b8d546ca16d7edcb06eda017e276383ea0f "Use [[nodiscard]] in
    SAL_WARN_UNUSED_RESULT where available", instead of an
    __attribute__((warn_unused_result)) language extension)
    
    Change-Id: I38d55b23c68e872b1e563e4672eda5a9512fb380
    Reviewed-on: https://gerrit.libreoffice.org/60322
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index c808a360b590..abc54029e6d7 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -24,7 +24,7 @@
 
 namespace unoidl {
 
-class LO_DLLPUBLIC_UNOIDL SAL_WARN_UNUSED NoSuchFileException final {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL NoSuchFileException final {
 public:
     SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {}
 
@@ -41,7 +41,7 @@ private:
     rtl::OUString uri_;
 };
 
-class LO_DLLPUBLIC_UNOIDL SAL_WARN_UNUSED FileFormatException final {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final {
 public:
     SAL_DLLPRIVATE FileFormatException(
         rtl::OUString const & uri, rtl::OUString const & detail):


More information about the Libreoffice-commits mailing list