LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

fixed casting problem between uint32 and time_t present for some compilers (MUSR-185)

Browse Source
This commit is contained in:
nemu
2011-05-07 14:18:58 +00:00
parent 87d366355f
commit 4063fed5ea
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@ changes since 0.9.0
=================================== ===================================
NEW any2many: force the user to define the exact NeXus ouput formate (HDF4, NEW any2many: force the user to define the exact NeXus ouput formate (HDF4,
HDF5, XML) HDF5, XML)
FIXED casting problem between uint32 and time_t for some compilers (MUSR-185)
FIXED bug reported in MUSR-183: missing background for 2nd histo in asymmetry fits when using musrt0. FIXED bug reported in MUSR-183: missing background for 2nd histo in asymmetry fits when using musrt0.
FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage FIXED Makefiles so that the NeXus support will not be built if it has not been enabled during the configure stage
FIXED ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot FIXED ASCII export from musrview in case of a Fourier-Power- or Fourier-Phase-difference plot

15
src/classes/PRunDataHandler.cpp
View File

@ -1809,13 +1809,15 @@ Bool_t PRunDataHandler::ReadMudFile()
} }
// get start/stop time of the run // get start/stop time of the run
time_t tval;
struct tm *dt; struct tm *dt;
TString stime(""); TString stime("");
Int_t yy = 0; Int_t yy = 0;
success = MUD_getTimeBegin( fh, &val ); success = MUD_getTimeBegin( fh, (UINT32*)&tval );
if (success) { if (success) {
runData.SetStartDateTime((const time_t)val); runData.SetStartDateTime((const time_t)tval);
dt = localtime((const time_t*)&val); dt = localtime((const time_t*)&tval);
assert(dt);
yy = dt->tm_year; yy = dt->tm_year;
if (yy > 100) if (yy > 100)
yy -= 100; yy -= 100;
@ -1849,10 +1851,11 @@ Bool_t PRunDataHandler::ReadMudFile()
} }
stime = TString(""); stime = TString("");
success = MUD_getTimeEnd( fh, &val ); success = MUD_getTimeEnd( fh, (UINT32*)&tval );
if (success) { if (success) {
runData.SetStopDateTime((const time_t)val); runData.SetStopDateTime((const time_t)tval);
dt = localtime((const time_t*)&val); dt = localtime((const time_t*)&tval);
assert(dt);
stime = ""; stime = "";
yy = dt->tm_year; yy = dt->tm_year;
if (yy > 100) if (yy > 100)