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

minor changes and removed W flag not found

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-11 11:07:50 +01:00
parent 288ef0a514
commit c6a597c3ec
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -12,7 +12,7 @@ option (USE_GUI "GUI" OFF)
option (USE_TESTS "TESTS" ON) option (USE_TESTS "TESTS" ON)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -Wno-misleading-indentation") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
else () else ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 ")
endif () endif ()

7
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7,6 +7,7 @@
#include "versionAPI.h" #include "versionAPI.h"
#include "slsDetectorCommand.h" #include "slsDetectorCommand.h"
#include "utilities.h" #include "utilities.h"
#include "string_utils.h"
#include "MySocketTCP.h" #include "MySocketTCP.h"
@ -1770,7 +1771,7 @@ std::string slsDetector::getSettingsDir() {
std::string slsDetector::setSettingsDir(std::string s) { std::string slsDetector::setSettingsDir(std::string s) {
sprintf(thisDetector->settingsDir, s.c_str()); sls::strcpy_safe(thisDetector->settingsDir, s.c_str());
return thisDetector->settingsDir; return thisDetector->settingsDir;
} }
@ -3244,8 +3245,8 @@ std::string slsDetector::setDetectorNetworkParameter(networkParameter index, int
int slsDetector::setUDPConnection() { int slsDetector::setUDPConnection() {
int fnum = F_SETUP_RECEIVER_UDP; int fnum = F_SETUP_RECEIVER_UDP;
int ret = FAIL; int ret = FAIL;
char args[3][MAX_STR_LENGTH] = {0}; char args[3][MAX_STR_LENGTH] = {{""}, {""}, {""}};;
char retvals[MAX_STR_LENGTH] = {0}; char retvals[MAX_STR_LENGTH] = {""};
FILE_LOG(logDEBUG1) << "Setting UDP Connection"; FILE_LOG(logDEBUG1) << "Setting UDP Connection";
// called before set up // called before set up

4
slsReceiverSoftware/include/GeneralData.h
View File

@ -480,8 +480,8 @@ private:
/** /**
* Print all variables * Print all variables
*/ */
void Print() const { void Print(TLogLevel level = logDEBUG1) const {
GeneralData::Print(); GeneralData::Print(level);
FILE_LOG(logINFO) << "Bytes Per Adc: " << bytesPerAdc; FILE_LOG(logINFO) << "Bytes Per Adc: " << bytesPerAdc;
} }
}; };