diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-01-31 12:47:22 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-01 10:42:07 +0100 |
| commit | dc4dae12637bf0e5ef5d05bec8cf2577cef75f42 (patch) | |
| tree | a4a938bc7fa3bc7448cfb337b8f5b7ee1bb274d2 /extensions/source/activex/StdAfx2.h | |
| parent | 98e9e033527d5f50df1fbf2918358c6f529d63ad (diff) | |
extensions: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I7bbb280810af51adc25595667f1c40aca0a8ae26
Reviewed-on: https://gerrit.libreoffice.org/48977
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'extensions/source/activex/StdAfx2.h')
| -rw-r--r-- | extensions/source/activex/StdAfx2.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 2d121dab1df2..0c48a5e5fb5a 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -24,10 +24,6 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H #define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H -#ifdef _MSC_VER -#pragma once -#endif - #define STRICT #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0502 @@ -35,11 +31,9 @@ #define _ATL_APARTMENT_THREADED #define _ATL_STATIC_REGISTRY -#pragma warning (push,1) -#pragma warning (disable:4548) - // expression before comma has no effect; expected expression with side-effect -#pragma warning (disable:4555) - // expression has no effect; expected expression with side-effect +#pragma warning (push) +#pragma warning (disable:4189) + // local variable is initialized but not referenced - in atlctl.h #if defined __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wall" @@ -75,6 +69,6 @@ extern CComModule _Module; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -#endif // !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED) +#endif // !defined(INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |