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

Merge commit '2efc74230a9105f21920ee93317781e1c56e34d1'

Browse Source
This commit is contained in:
Darth Vader 2021-04-22 21:39:02 +00:00
commit b8563691d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phreeqcpp/ChartHandler.cpp
View File

@ -2,11 +2,11 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if defined MULTICHART #if defined MULTICHART
#include "Phreeqc.h"
#ifdef _DEBUG #ifdef _DEBUG
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
#endif #endif
#include "ChartHandler.h" #include "ChartHandler.h"
#include "phreeqc.h"
#include <iostream> #include <iostream>

2
phreeqcpp/ChartObject.cpp
View File

@ -2,6 +2,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#ifdef MULTICHART #ifdef MULTICHART
#include "Phreeqc.h"
#ifdef _DEBUG #ifdef _DEBUG
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger) #pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
#endif #endif
@ -12,7 +13,6 @@
#include <fstream> #include <fstream>
#include <math.h> #include <math.h>
#include <iomanip> #include <iomanip>
#include "Phreeqc.h"
#include "phqalloc.h" #include "phqalloc.h"
#include "Form1.h" #include "Form1.h"