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

minor

Browse Source
This commit is contained in:
Erik Frojdh 2019-05-14 14:53:59 +02:00
parent 9fd2866fc0
commit 1029ce9705
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.clang-tidy
View File

@ -23,10 +23,10 @@ AnalyzeTemporaryDtors: false
FormatStyle: none FormatStyle: none
CheckOptions: CheckOptions:
- { key: readability-identifier-naming.NamespaceCase, value: lower_case } - { key: readability-identifier-naming.NamespaceCase, value: lower_case }
- { key: readability-identifier-naming.FunctionCase, value: lower_case } # - { key: readability-identifier-naming.FunctionCase, value: lower_case }
- { key: readability-identifier-naming.ClassCase, value: CamelCase } - { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.MethodCase, value: CamelCase } # - { key: readability-identifier-naming.MethodCase, value: CamelCase }
- { key: readability-identifier-naming.StructCase, value: CamelCase } # - { key: readability-identifier-naming.StructCase, value: CamelCase }
- { key: readability-identifier-naming.VariableCase, value: lower_case } # - { key: readability-identifier-naming.VariableCase, value: lower_case }
- { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE } - { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE }
... ...

2
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -421,7 +421,7 @@ void multiSlsDetector::addSlsDetector(const std::string &hostname) {
} }
// get type by connecting // get type by connecting
detectorType type = slsDetector::getTypeFromDetector(hostname.c_str(), DEFAULT_PORTNO); detectorType type = slsDetector::getTypeFromDetector(hostname, DEFAULT_PORTNO);
int pos = (int)detectors.size(); int pos = (int)detectors.size();
detectors.push_back(sls::make_unique<slsDetector>(type, multiId, pos, false)); detectors.push_back(sls::make_unique<slsDetector>(type, multiId, pos, false));
multi_shm()->numberOfDetectors = detectors.size(); multi_shm()->numberOfDetectors = detectors.size();

2
slsSupportLib/tests/test-FixedCapacityContainer.cpp
View File

@ -10,7 +10,7 @@ SCENARIO("FixedCapacityContainers can be sized and resized", "[support]") {
FixedCapacityContainer<int, n_elem> vec; FixedCapacityContainer<int, n_elem> vec;
REQUIRE(vec.empty()); REQUIRE(vec.empty());
REQUIRE(vec.size() == 0); REQUIRE(vec.size() == 0); //NOLINT
REQUIRE(vec.capacity() == n_elem); REQUIRE(vec.capacity() == n_elem);
REQUIRE(sizeof(vec) == sizeof(int) * n_elem + sizeof(size_t)); REQUIRE(sizeof(vec) == sizeof(int) * n_elem + sizeof(size_t));