max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

turn off warnings for dll linkage for std::list and std::vector

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6012 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-01-10 05:22:19 +00:00
parent 55b38474c3
commit fa8def7f72
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/IPhreeqc.hpp
View File

@ -711,6 +711,11 @@ protected:
protected:
#if defined(_MSC_VER)
/* disable warning C4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' */
#pragma warning(disable:4251)
#endif
bool DatabaseLoaded;
bool ClearAccumulated;
bool UpdateComponents;
@ -731,12 +736,6 @@ protected:
std::string LogString;
std::vector< std::string > LogLines;
#if defined(_MSC_VER)
/* disable warning C4251: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' */
#pragma warning(disable:4251)
#endif
IErrorReporter *ErrorReporter;
std::string ErrorString;
std::vector< std::string > ErrorLines;
@ -759,11 +758,6 @@ protected:
std::string LogFileName;
std::string DumpFileName;
#if defined(_MSC_VER)
/* reset warning C4251 */
#pragma warning(default:4251)
#endif
protected:
Phreeqc* PhreeqcPtr;
FILE *input_file;
@ -774,6 +768,11 @@ protected:
static size_t InstancesIndex;
const size_t Index;
#if defined(_MSC_VER)
/* reset warning C4251 */
#pragma warning(default:4251)
#endif
#if defined(CPPUNIT)
friend class TestIPhreeqc;
friend class TestSelectedOutput;