INTEGRATION: CWS obo05 (1.5.8); FILE MERGED

2006/08/28 13:47:49 obo 1.5.8.1: #i53611# diable warnings C4917 and 4555
This commit is contained in:
Vladimir Glazounov
2006-09-25 12:30:16 +00:00
parent 36e319ce5f
commit 26fb225577

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: esdll.cxx,v $ * $RCSfile: esdll.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: hr $ $Date: 2006-06-20 05:40:26 $ * last change: $Author: vg $ $Date: 2006-09-25 13:30:16 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -39,6 +39,9 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1300) #if defined(_MSC_VER) && (_MSC_VER >= 1300)
#undef _DEBUG #undef _DEBUG
#endif #endif
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
#endif
#include "stdafx.h" #include "stdafx.h"
@@ -86,4 +89,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
// warning C4505: 'xxx' : unreferenced local function has been removed // warning C4505: 'xxx' : unreferenced local function has been removed
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable: 4505) #pragma warning(disable: 4505)
#endif #endif