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

Merge branch 'developer' into gotthard2

Browse Source
This commit is contained in:
maliakal_d
2020-01-16 16:52:08 +01:00
parent e8bdf5a505 69dd5f3b5e
commit 95030bc55f
33 changed files with 715 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/CmdProxy.h
View File

@ -2,8 +2,8 @@
#include "Detector.h"
#include "Result.h"
#include "sls_detector_exceptions.h"
#include "network_utils.h"
#include "sls_detector_exceptions.h"
#include <iostream>
#include <map>
#include <string>
@ -449,7 +449,7 @@ class CmdProxy {
}
inline unsigned int stoiHex(const std::string& s) {
unsigned long lresult = stoul(s, 0, 16);
unsigned long lresult = stoul(s, nullptr, 16);
unsigned int result = lresult;
if (result != lresult) {
throw std::out_of_range("cannot convert to unsigned int");
@ -458,7 +458,7 @@ class CmdProxy {
}
inline unsigned long int stoulHex(const std::string& s) {
unsigned long result = stoul(s, 0, 16);
unsigned long result = stoul(s, nullptr, 16);
return result;
}