Kaydet (Commit) 7eb42bdd authored tarafından Thomas Arnhold's avatar Thomas Arnhold

windows: warning 4706 is disabled globally in com_MSC_defs.mk

So there is no need to do this locally, too.

Change-Id: Ibc623235cae07a86dfd0dbc1d7672ca4273facec
üst 54a17dd2
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#pragma disable_warn #pragma disable_warn
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning(push, 1) #pragma warning(push, 1)
#pragma warning(disable:4273 4701 4706) #pragma warning(disable:4273 4701)
#endif #endif
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY #if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
......
...@@ -607,10 +607,6 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash( ...@@ -607,10 +607,6 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
return bRet; return bRet;
} }
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4706) // assignment within conditional expression
#endif
sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
SvxAutoCorrDoc& rDoc, const OUString& rTxt, SvxAutoCorrDoc& rDoc, const OUString& rTxt,
...@@ -697,9 +693,6 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( ...@@ -697,9 +693,6 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
return bRet; return bRet;
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif
sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt, sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
xub_StrLen nSttPos, xub_StrLen nEndPos, xub_StrLen nSttPos, xub_StrLen nEndPos,
......
...@@ -214,7 +214,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { ...@@ -214,7 +214,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
#pragma disable_warn #pragma disable_warn
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning(push, 1) #pragma warning(push, 1)
#pragma warning(disable: 4273 4701 4702 4706) #pragma warning(disable: 4273 4701 4702)
#endif #endif
%} %}
/* /*
......
...@@ -45,10 +45,7 @@ sal_uInt32 AStringLen( const sal_Char *pAStr ) ...@@ -45,10 +45,7 @@ sal_uInt32 AStringLen( const sal_Char *pAStr )
return nStrLen; return nStrLen;
} // AStringLen } // AStringLen
/* disable assignment within condition expression */
#if defined WNT && defined _MSC_VER
#pragma warning( disable : 4706 )
#endif
sal_Char* cpystr( sal_Char* dst, const sal_Char* src ) sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
{ {
const sal_Char* psrc = src; const sal_Char* psrc = src;
......
...@@ -258,7 +258,6 @@ extern "C" { ...@@ -258,7 +258,6 @@ extern "C" {
#elif ( defined( _MSC_VER ) ) #elif ( defined( _MSC_VER ) )
#pragma warning( disable:4127 ) // Disable "conditional expression is constant" warning for debug macros. #pragma warning( disable:4127 ) // Disable "conditional expression is constant" warning for debug macros.
#pragma warning( disable:4706 ) // Disable "assignment within conditional expression" for Microsoft headers.
#endif #endif
...@@ -266,10 +265,6 @@ extern "C" { ...@@ -266,10 +265,6 @@ extern "C" {
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#if ( defined( _MSC_VER ) )
#pragma warning( default:4706 )
#endif
#else #else
#error unknown OS - update this file to support your OS #error unknown OS - update this file to support your OS
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment