From 6f0c11665e5e0fb73c04b7780fb5e323c48a67e1 Mon Sep 17 00:00:00 2001 From: Reid Townson Date: Thu, 30 Nov 2023 11:26:05 -0500 Subject: [PATCH] Fix a c++14 mingw compiler error and warnings --- HEN_HOUSE/cutils/egs_c_utils.c | 13 +++++++++++-- .../egs_phsp_scoring/egs_phsp_scoring.cpp | 2 +- HEN_HOUSE/egs++/egs_base_source.h | 7 ++++++- HEN_HOUSE/egs++/egs_run_control.cpp | 2 +- HEN_HOUSE/egs++/egs_spectra.cpp | 7 +------ .../geometry/egs_nd_geometry/egs_nd_geometry.h | 2 +- HEN_HOUSE/iaea_phsp/utilities.cpp | 2 +- HEN_HOUSE/omega/progs/ctcreate/ReadCT_DICOM.c | 2 +- HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran | 2 +- 9 files changed, 24 insertions(+), 15 deletions(-) diff --git a/HEN_HOUSE/cutils/egs_c_utils.c b/HEN_HOUSE/cutils/egs_c_utils.c index f9fb0a6a5..83c60146c 100644 --- a/HEN_HOUSE/cutils/egs_c_utils.c +++ b/HEN_HOUSE/cutils/egs_c_utils.c @@ -86,7 +86,11 @@ void egsOpenControlFile(const char *fname, int *status, int len) { if (__my_fd > 0) { break; } - _sleep(1000); + #ifdef WIN32 + Sleep(1000); + #else + _sleep(1000); + #endif } if (__my_fd < 0) { *status = __my_fd; @@ -208,7 +212,12 @@ void egsReadControlFile(char *buf, const int *n, int *status, int len) { void egsSleep(const int *secs) { unsigned int msecs = *secs * 1000; - _sleep(msecs); + + #ifdef WIN32 + Sleep(msecs); + #else + _sleep(msecs); + #endif } void egsPerror(const char *str, int len) { perror(str); diff --git a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp index 958a8b71c..17a919422 100644 --- a/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp +++ b/HEN_HOUSE/egs++/ausgab_objects/egs_phsp_scoring/egs_phsp_scoring.cpp @@ -46,7 +46,7 @@ EGS_PhspScoring::EGS_PhspScoring(const string &Name, EGS_ObjectFactory *f) : - EGS_AusgabObject(Name,f), phsp_index(0), store_max(1000), phsp_file(0), + EGS_AusgabObject(Name,f), phsp_index(0), store_max(1000), phsp_file(), count(0), countg(0), emin(1.e30), emax(-1.e30), first_flush(true), is_restart(false) { otype = "EGS_PhspScoring"; } diff --git a/HEN_HOUSE/egs++/egs_base_source.h b/HEN_HOUSE/egs++/egs_base_source.h index 392eed3d8..4ab257b54 100644 --- a/HEN_HOUSE/egs++/egs_base_source.h +++ b/HEN_HOUSE/egs++/egs_base_source.h @@ -508,7 +508,12 @@ class EGS_EXPORT EGS_BaseSpectrum { * This function prints information about the expected and actually * sampled average energy of the spectrum using egsInformation(). */ - void reportAverageEnergy() const; + void reportAverageEnergy() const { + egsInformation("expected average energy: %g\n",expectedAverage()); + EGS_Float e=0,de=0; + getSampledAverage(e,de); + egsInformation("sampled average energy: %g +/- %g\n",e,de); + }; protected: diff --git a/HEN_HOUSE/egs++/egs_run_control.cpp b/HEN_HOUSE/egs++/egs_run_control.cpp index 426204469..4b8d3c20b 100644 --- a/HEN_HOUSE/egs++/egs_run_control.cpp +++ b/HEN_HOUSE/egs++/egs_run_control.cpp @@ -378,7 +378,7 @@ void EGS_UniformRunControl::describeRCO() { #define CLOSE_FILE _close #define CREATE_FLAGS _O_CREAT | _O_EXCL | _O_RDWR, _S_IREAD | _S_IWRITE #define OPEN_FLAGS _O_RDWR,_S_IREAD | _S_IWRITE - #define WAIT_FOR_FILE _sleep(1000) + #define WAIT_FOR_FILE Sleep(1000) #define WRITE_FILE _write #define READ_FILE _read diff --git a/HEN_HOUSE/egs++/egs_spectra.cpp b/HEN_HOUSE/egs++/egs_spectra.cpp index 4b92109a5..632d2f383 100644 --- a/HEN_HOUSE/egs++/egs_spectra.cpp +++ b/HEN_HOUSE/egs++/egs_spectra.cpp @@ -61,12 +61,7 @@ using namespace std; -void EGS_BaseSpectrum::reportAverageEnergy() const { - egsInformation("expected average energy: %g\n",expectedAverage()); - EGS_Float e=0,de=0; - getSampledAverage(e,de); - egsInformation("sampled average energy: %g +/- %g\n",e,de); -} + /*! \brief A monoenergetic particle spectrum. \ingroup egspp_main diff --git a/HEN_HOUSE/egs++/geometry/egs_nd_geometry/egs_nd_geometry.h b/HEN_HOUSE/egs++/geometry/egs_nd_geometry/egs_nd_geometry.h index 15ac5c716..794b09064 100644 --- a/HEN_HOUSE/egs++/geometry/egs_nd_geometry/egs_nd_geometry.h +++ b/HEN_HOUSE/egs++/geometry/egs_nd_geometry/egs_nd_geometry.h @@ -371,7 +371,7 @@ class EGS_NDG_EXPORT EGS_NDGeometry : public EGS_BaseGeometry { EGS_Float &t, int *newmed=0, EGS_Vector *normal=0) { if (ireg >= 0) { int itmp = ireg; - int inext = -1, idelta, lnew_j=0; + int inext = -1, idelta=0, lnew_j=0; for (int j=N-1; j>=0; j--) { int l = itmp/n[j]; int lnew = g[j]->howfar(l,x,u,t,0,normal); diff --git a/HEN_HOUSE/iaea_phsp/utilities.cpp b/HEN_HOUSE/iaea_phsp/utilities.cpp index e9279ad44..396665e10 100644 --- a/HEN_HOUSE/iaea_phsp/utilities.cpp +++ b/HEN_HOUSE/iaea_phsp/utilities.cpp @@ -240,7 +240,7 @@ FILE *open_file(char *filename, const char*extension, const char *access) // char *filename1 = new(char[len+strlen(extension)+1]); const int filenameLength = len+strlen(extension)+1; - char *filename1 = new(char[filenameLength]); + char *filename1 = new char[filenameLength]; strcpy(filename1,filename); // temp filename for appending extension diff --git a/HEN_HOUSE/omega/progs/ctcreate/ReadCT_DICOM.c b/HEN_HOUSE/omega/progs/ctcreate/ReadCT_DICOM.c index 75bf52cfe..79a0f0702 100644 --- a/HEN_HOUSE/omega/progs/ctcreate/ReadCT_DICOM.c +++ b/HEN_HOUSE/omega/progs/ctcreate/ReadCT_DICOM.c @@ -333,7 +333,7 @@ int string_to_doubles (const char *s,int num_doub) } -F77_OBJ_(readct_dicom,READCT_DICOM)(char *ct_filename, int ct_arraysize[3], +int F77_OBJ_(readct_dicom,READCT_DICOM)(char *ct_filename, int ct_arraysize[3], short *ctdata, float ct_offset[3], float ct_voxelsize[3],int *ct_errorcode) { diff --git a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran index 7aac85ed5..034e20a13 100644 --- a/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran +++ b/HEN_HOUSE/user_codes/dosxyznrc/dosxyznrc.mortran @@ -4402,7 +4402,7 @@ REAL xbnd($IMAX+1), "voxel x boundaries" ERR50AVG, "average % error of doses > 50% of max dose" ERR50FRAC, "average error of doses > 50% of max" " dose as a fraction of max dose" - DOSEFRAC, "fraction for calculating av. rel. uncertainty" + DOSEFRAC, "fraction for calculating av. rel. unc." DOSEmin, "DOSEFRAC*MAXDOS(1)" ARUFRAC; "average relative uncertainty on all voxels" "with dose > DOSEFRAC*Dmax"