Merge commit '2efc74230a9105f21920ee93317781e1c56e34d1'

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

View File

@ -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>

View File

@ -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"