diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-30 14:14:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-02 08:02:19 +0100 |
| commit | 72b17442010d512f6cf96a871409b1777ed08748 (patch) | |
| tree | 73a0553257a7f58981e242e6dcb0447196f8cf09 /extensions | |
| parent | 5a4791a8f50192935caa4e7b2032f9cd78b307e5 (diff) | |
Silence clang-cl -Winvalid-offsetof in ATL-macro expansion
Change-Id: I2bfa87abd111faf414d2603025d3613f7e0ae104
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/SOActiveX.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index 515b0ee5d2e5..bacee8180134 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -124,6 +124,12 @@ BEGIN_COM_MAP(CSOActiveX) COM_INTERFACE_ENTRY(IObjectSafety) END_COM_MAP() +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winvalid-offsetof" + // offset of on non-standard-layout type '_PropMapClass' (aka 'CSOActiveX'), + // expanded from macro 'PROP_DATA_ENTRY' +#endif BEGIN_PROP_MAP(CSOActiveX) PROP_DATA_ENTRY("_cx", m_sizeExtent.cx, VT_UI4) PROP_DATA_ENTRY("_cy", m_sizeExtent.cy, VT_UI4) @@ -131,6 +137,9 @@ BEGIN_PROP_MAP(CSOActiveX) // PROP_ENTRY("Property Description", dispid, clsid) // PROP_PAGE(CLSID_StockColorPage) END_PROP_MAP() +#if defined __clang__ +#pragma clang diagnostic pop +#endif BEGIN_CONNECTION_POINT_MAP(CSOActiveX) END_CONNECTION_POINT_MAP() |