diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-01 16:19:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-02 08:18:57 +0200 |
| commit | 38ee6b2ad540c0d5cc0182396787d4c7625ea064 (patch) | |
| tree | 9980898ba49c225d0a851a60bf97d276e07f4220 /shell/inc | |
| parent | 4d45df2632dddde3d8e34315c8ee76575587a62a (diff) | |
-Werror,-Wmicrosoft-exception-spec (clang-cl)
No idea why that started to show up now, but
C:/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/um/combaseapi.h
contains
> #define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method
while
C:/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/um/winnt.h
contains
> #define STDMETHODIMP HRESULT STDMETHODCALLTYPE
which caused failures like
> [build CXX] embedserv/source/inprocserv/dllentry.cxx
> embedserv/source/inprocserv/dllentry.cxx(261,40): error: 'QueryInterface' is missing exception specification '__attribute__((nothrow))' [-Werror,-Wmicrosoft-exception-spec]
> STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void ** ppv )
> ^
> embedserv/source/inprocserv/dllentry.cxx(143,15): note: previous declaration is here
> STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
> ^
Change-Id: I0fe3554c2da4089bf0f883e1132d6f2ee95ae2c3
Reviewed-on: https://gerrit.libreoffice.org/79970
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/columninfo.hxx | 12 | ||||
| -rw-r--r-- | shell/inc/infotips.hxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/shell/inc/columninfo.hxx b/shell/inc/columninfo.hxx index 105ba7566de5..6a6710a65ac6 100644 --- a/shell/inc/columninfo.hxx +++ b/shell/inc/columninfo.hxx @@ -33,23 +33,23 @@ public: // IUnknown methods - virtual HRESULT STDMETHODCALLTYPE QueryInterface( + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) override; - virtual ULONG STDMETHODCALLTYPE AddRef() override; + virtual COM_DECLSPEC_NOTHROW ULONG STDMETHODCALLTYPE AddRef() override; - virtual ULONG STDMETHODCALLTYPE Release() override; + virtual COM_DECLSPEC_NOTHROW ULONG STDMETHODCALLTYPE Release() override; // IColumnProvider - virtual HRESULT STDMETHODCALLTYPE Initialize(LPCSHCOLUMNINIT psci) override; + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE Initialize(LPCSHCOLUMNINIT psci) override; - virtual HRESULT STDMETHODCALLTYPE GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci) override; + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci) override; - virtual HRESULT STDMETHODCALLTYPE GetItemData( + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE GetItemData( LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) override; private: diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx index 0155559752ce..ac9218a71762 100644 --- a/shell/inc/infotips.hxx +++ b/shell/inc/infotips.hxx @@ -47,9 +47,9 @@ public: // IQueryInfo methods - virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, PWSTR* ppwszTip) override; + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, PWSTR* ppwszTip) override; - virtual HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags) override; + virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags) override; // IPersist methods |