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

fixed compilation for linux c++11

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12300 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2017-02-01 02:22:14 +00:00
parent 80f143a6c6
commit 424c070370
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Phreeqc.h
View File

@ -2006,7 +2006,11 @@ public:
#endif /*defined (PHREEQ98) || defined (_MSC_VER)*/
#if defined(HAVE_ISFINITE)
# define PHR_ISFINITE(x) isfinite(x)
# if __GNUC__ && (__cplusplus >= 201103L)
# define PHR_ISFINITE(x) std::isfinite(x)
# else
# define PHR_ISFINITE(x) isfinite(x)
# endif
#elif defined(HAVE_FINITE)
# define PHR_ISFINITE(x) finite(x)
#elif defined(HAVE_ISNAN)
@ -2222,4 +2226,4 @@ void PhreeqcIWait(Phreeqc *phreeqc);
char * _string_duplicate(const char *token, const char *szFileName, int nLine);
#endif
#endif //_INC_UTILITIES_NAMESPACE_H
#endif //_INC_UTILITIES_NAMESPACE_H

2
kinetics.cpp
View File

@ -1253,7 +1253,7 @@ set_and_run_wrapper(int i, int use_mix, int use_kinetics, int nsaver,
int old_diag, old_itmax;
LDBLE old_tol, old_min_value, old_step, old_pe, old_pp_column_scale;
LDBLE small_pe_step, small_step;
#if (__cplusplus >= 201103L) || (_MSC_VER >= 1600)
#if (__GNUC__ && (__cplusplus >= 201103L) || (_MSC_VER >= 1600)
std::unique_ptr<cxxPPassemblage> pp_assemblage_save=NULL;
std::unique_ptr<cxxSSassemblage> ss_assemblage_save=NULL;
std::unique_ptr<cxxKinetics> kinetics_save=NULL;