From 2569ffbf104621a4b3e68f0dca86614efabf8821 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 17 Nov 2017 08:53:05 +0100 Subject: [PATCH] fixed warnings, back to int warning in debugstream due to 64 bit --- slsDetectorGui/include/qDebugStream.h | 2 +- slsDetectorGui/src/qDetectorMain.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorGui/include/qDebugStream.h b/slsDetectorGui/include/qDebugStream.h index 9c47d43c0..2c728dd25 100644 --- a/slsDetectorGui/include/qDebugStream.h +++ b/slsDetectorGui/include/qDebugStream.h @@ -87,7 +87,7 @@ protected: m_string.append(p, p + n); //changed from uint because of 64 bit - unsigned int pos = 0; + int pos = 0; while (pos != string::npos){ pos = m_string.find('\n'); diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index a084ca9f2..f33af996a 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -657,12 +657,12 @@ void qDetectorMain::ExecuteHelp(QAction *action){ cout << "About: Common GUI for Mythen, Eiger, Gotthard, Jungfrau, Moench and Propix detectors" << endl; #endif char version[200]; - int64_t retval= SVNREV; + long long unsigned int retval= SVNREV; retval= (retval <<32) | SVNDATE; sprintf(version,"%llx",retval); 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"); string thisClientVersion = string(version);