detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-06 04:40:02 +02:00
Code Issues Actions Packages Releases Activity

fixed warnings, back to int warning in debugstream due to 64 bit

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-17 08:53:05 +01:00
parent c1e735c1b4
commit 2569ffbf10
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/include/qDebugStream.h
View File

@ -87,7 +87,7 @@ protected:
m_string.append(p, p + n); m_string.append(p, p + n);
//changed from uint because of 64 bit //changed from uint because of 64 bit
unsigned int pos = 0; int pos = 0;
while (pos != string::npos){ while (pos != string::npos){
pos = m_string.find('\n'); pos = m_string.find('\n');

4
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -657,12 +657,12 @@ void qDetectorMain::ExecuteHelp(QAction *action){
cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl; cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl;
#endif #endif
char version[200]; char version[200];
int64_t retval= SVNREV; long long unsigned int retval= SVNREV;
retval= (retval <<32) | SVNDATE; retval= (retval <<32) | SVNDATE;
sprintf(version,"%llx",retval); sprintf(version,"%llx",retval);
string thisGUIVersion = string(version); string thisGUIVersion = string(version);
sprintf(version,"%llx",myDet->getId(slsDetectorDefs::THIS_SOFTWARE_VERSION)); sprintf(version,"%llx",(long long unsigned int)myDet->getId(slsDetectorDefs::THIS_SOFTWARE_VERSION));
qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteHelp"); qDefs::checkErrorMessage(myDet,"qDetectorMain::ExecuteHelp");
string thisClientVersion = string(version); string thisClientVersion = string(version);