diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-12-12 11:42:06 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-12-12 11:42:06 +1100 |
| commit | a078390895594ab190e789ea578b2594fe5216b9 (patch) | |
| tree | 9b5923deb3956f7e06abc8a3732cb5cd4597afcf | |
| parent | 9d7e296b96f56f6274b8f35c4ee8d14c92f72532 (diff) | |
| download | scintilla-mirror-a078390895594ab190e789ea578b2594fe5216b9.tar.gz | |
Bug [#2115]. Avoid Clang warnings with COM_DECLSPEC_NOTHROW from declaration.
| -rw-r--r-- | win32/PlatWin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 6f0c6553b..3c29d5351 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -1502,7 +1502,7 @@ class BlobInline : public IDWriteInlineObject { STDMETHODIMP_(ULONG)Release() override; // IDWriteInlineObject - STDMETHODIMP Draw( + COM_DECLSPEC_NOTHROW STDMETHODIMP Draw( void *clientDrawingContext, IDWriteTextRenderer *renderer, FLOAT originX, @@ -1511,9 +1511,9 @@ class BlobInline : public IDWriteInlineObject { BOOL isRightToLeft, IUnknown *clientDrawingEffect ) override; - STDMETHODIMP GetMetrics(DWRITE_INLINE_OBJECT_METRICS *metrics) override; - STDMETHODIMP GetOverhangMetrics(DWRITE_OVERHANG_METRICS *overhangs) override; - STDMETHODIMP GetBreakConditions( + COM_DECLSPEC_NOTHROW STDMETHODIMP GetMetrics(DWRITE_INLINE_OBJECT_METRICS *metrics) override; + COM_DECLSPEC_NOTHROW STDMETHODIMP GetOverhangMetrics(DWRITE_OVERHANG_METRICS *overhangs) override; + COM_DECLSPEC_NOTHROW STDMETHODIMP GetBreakConditions( DWRITE_BREAK_CONDITION *breakConditionBefore, DWRITE_BREAK_CONDITION *breakConditionAfter) override; public: @@ -1552,7 +1552,7 @@ STDMETHODIMP_(ULONG) BlobInline::Release() { } /// Implement IDWriteInlineObject -HRESULT STDMETHODCALLTYPE BlobInline::Draw( +COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::Draw( void*, IDWriteTextRenderer*, FLOAT, @@ -1566,7 +1566,7 @@ HRESULT STDMETHODCALLTYPE BlobInline::Draw( return S_OK; } -HRESULT STDMETHODCALLTYPE BlobInline::GetMetrics( +COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetMetrics( DWRITE_INLINE_OBJECT_METRICS *metrics ) { metrics->width = width; @@ -1576,7 +1576,7 @@ HRESULT STDMETHODCALLTYPE BlobInline::GetMetrics( return S_OK; } -HRESULT STDMETHODCALLTYPE BlobInline::GetOverhangMetrics( +COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetOverhangMetrics( DWRITE_OVERHANG_METRICS *overhangs ) { overhangs->left = 0; @@ -1586,7 +1586,7 @@ HRESULT STDMETHODCALLTYPE BlobInline::GetOverhangMetrics( return S_OK; } -HRESULT STDMETHODCALLTYPE BlobInline::GetBreakConditions( +COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE BlobInline::GetBreakConditions( DWRITE_BREAK_CONDITION *breakConditionBefore, DWRITE_BREAK_CONDITION *breakConditionAfter ) { |