OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disabled warnings from compilation of ODB API

Browse Source 
Disabled a couple of more warnings from compilation of ODB API.
Pushing/popping pragmas before and after inclusion of ODB API headers.
This commit is contained in:
Stein Dale 2015-06-04 13:02:49 +02:00
parent be1759835e
commit fcfd2603e0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp
View File

@ -17,10 +17,18 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// Get rid of warnings from compilation of ODB API
#ifdef _MSC_VER #ifdef _MSC_VER
// Get rid of warnings from compilation of ODB API
#pragma warning(push)
#pragma warning(disable: 4018)
#pragma warning(disable: 4482) #pragma warning(disable: 4482)
#pragma warning(disable: 4584) #pragma warning(disable: 4584)
#pragma warning(disable: 4800)
#endif
#include <odb_API.h>
#include <odb_Enum.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif #endif
#include "RifOdbReader.h" #include "RifOdbReader.h"
@ -28,9 +36,6 @@
#include "RigFemPartCollection.h" #include "RigFemPartCollection.h"
#include "RigFemPart.h" #include "RigFemPart.h"
#include <odb_API.h>
#include <odb_Enum.h>
#include <map> #include <map>
#include <iostream> #include <iostream>
#include <limits> #include <limits>