From 7dcf6eddc3f415f06b1046775e1edcb99cf2aae8 Mon Sep 17 00:00:00 2001
From: Jochem Snuverink <jochem.snuverink@psi.ch>
Date: Wed, 5 Dec 2018 17:11:06 +0100
Subject: [PATCH] fix logic compiler warnings; @ext-rogers_c: please check
---
src/Classic/AbsBeamline/MultipoleTFunctions/Polynomial.h | 2 +-
.../classic_src/AbsBeamline/VariableRFCavityFringeFieldTest.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Classic/AbsBeamline/MultipoleTFunctions/Polynomial.h b/src/Classic/AbsBeamline/MultipoleTFunctions/Polynomial.h
index 9847b14f1..54b3b8bf1 100644
--- a/src/Classic/AbsBeamline/MultipoleTFunctions/Polynomial.h
+++ b/src/Classic/AbsBeamline/MultipoleTFunctions/Polynomial.h
@@ -118,7 +118,7 @@ private:
inline
int Polynomial::getCoefficient(const std::size_t &order) const {
- if (order > maxXorder_m || order < 0) {
+ if (order > maxXorder_m) {
return 0;
}
return coefficients_m[order];
diff --git a/tests/classic_src/AbsBeamline/VariableRFCavityFringeFieldTest.cpp b/tests/classic_src/AbsBeamline/VariableRFCavityFringeFieldTest.cpp
index dfe396133..ef5aefc3d 100644
--- a/tests/classic_src/AbsBeamline/VariableRFCavityFringeFieldTest.cpp
+++ b/tests/classic_src/AbsBeamline/VariableRFCavityFringeFieldTest.cpp
@@ -171,7 +171,7 @@ void partial(VariableRFCavityFringeField& cav, Vector_t pos, double t, double de
if (var == 3) {
tMinus -= delta;
tPlus += delta;
- } else if (var >= 0 or var < 3) {
+ } else if (var >= 0 && var < 3) {
posMinus[var] -= delta;
posPlus[var] += delta;
}
--
GitLab