mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
Merge commit '0feb71507f3a246e8021a2c4781ab6c814c73e71'
This commit is contained in:
commit
2efc74230a
@ -2,11 +2,11 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
#if defined MULTICHART
|
||||
#include "Phreeqc.h"
|
||||
#ifdef _DEBUG
|
||||
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
|
||||
#endif
|
||||
#include "ChartHandler.h"
|
||||
#include "phreeqc.h"
|
||||
#include <iostream>
|
||||
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
//
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
#ifdef MULTICHART
|
||||
#include "Phreeqc.h"
|
||||
#ifdef _DEBUG
|
||||
#pragma warning(disable : 4786) // disable truncation warning (Only used by debugger)
|
||||
#endif
|
||||
@ -12,7 +13,6 @@
|
||||
#include <fstream>
|
||||
#include <math.h>
|
||||
#include <iomanip>
|
||||
#include "Phreeqc.h"
|
||||
#include "phqalloc.h"
|
||||
|
||||
#include "Form1.h"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user