From e9073eadef4e7635ab86316d1a68be5023632c78 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Wed, 31 Jan 2018 15:32:48 +0300 Subject: [PATCH] idlc: MSVC: pragma warning: make more specific, remove obsolete Change-Id: I0fbba0c1b12f9ade703ceee477dae4056fe9d31e Reviewed-on: https://gerrit.libreoffice.org/48994 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- idlc/inc/idlctypes.hxx | 4 ---- idlc/source/parser.y | 3 +-- idlc/source/scanner.l | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/idlc/inc/idlctypes.hxx b/idlc/inc/idlctypes.hxx index 6d013f834e75..273429e530f8 100644 --- a/idlc/inc/idlctypes.hxx +++ b/idlc/inc/idlctypes.hxx @@ -39,10 +39,6 @@ class AstScope; AstDeclaration* scopeAsDecl(AstScope* pScope); AstScope* declAsScope(AstDeclaration* pDecl); -#ifdef _MSC_VER -#pragma warning( disable : 4541 ) -#endif - // flags used for attributes, properties and services #define AF_INVALID 0x0000 #define AF_READONLY 0x0001 diff --git a/idlc/source/parser.y b/idlc/source/parser.y index aa8302cac46f..0fe8eb8049c1 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -208,8 +208,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { // Suppress any warnings from generated code: #if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable: 4273 4701 4702) +#pragma warning(disable: 4702) // unreachable code #endif %} /* diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 4c78ab968bd7..180381c3ff38 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -252,7 +252,6 @@ static void parseLineAndFile(sal_Char* pBuf) #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-label" #elif defined _MSC_VER -#pragma warning(push, 1) /**/ #ifdef yywrap #undef yywrap