From 3a4235f2f1192abc8adbe75871bbca6714984386 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 17 May 2019 11:37:17 +0100 Subject: [PATCH 1/2] although it was correct, osx gave lots of warnings for -Wlogical-op-parentheses replace `if (a || b && c)` with `if (a || (b && c))` even though the two are the same. --- .../sirf/Gadgetron/gadgetron_data_containers.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h b/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h index ca0349311..1858e9b33 100644 --- a/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h +++ b/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h @@ -509,7 +509,7 @@ namespace sirf { } Iterator& operator++() { - if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) throw std::out_of_range("cannot advance out-of-range iterator"); ++iter_; if (iter_ == end_ && i_ < n_ - 1) { @@ -523,7 +523,7 @@ namespace sirf { Iterator& operator++(int) { sptr_iter_.reset(new Iterator(*this)); - if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) throw std::out_of_range("cannot advance out-of-range iterator"); ++iter_; if (iter_ == end_ && i_ < n_ - 1) { @@ -536,7 +536,7 @@ namespace sirf { } NumRef& operator*() { - if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) throw std::out_of_range ("cannot dereference out-of-range iterator"); return *iter_; @@ -584,7 +584,7 @@ namespace sirf { } Iterator_const& operator++() { - if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) throw std::out_of_range("cannot advance out-of-range iterator"); ++iter_; if (iter_ == end_ && i_ < n_ - 1) { @@ -599,7 +599,7 @@ namespace sirf { //Iterator_const& operator++(int) //{ // sptr_iter_.reset(new Iterator_const(*this)); - // if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + // if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) // throw std::out_of_range("cannot advance out-of-range iterator"); // ++iter_; // if (iter_ == end_ && i_ < n_ - 1) { @@ -612,7 +612,7 @@ namespace sirf { //} const NumRef& operator*() const { - if (i_ >= n_ || i_ == n_ - 1 && iter_ == end_) + if (i_ >= n_ || (i_ == n_ - 1 && iter_ == end_)) throw std::out_of_range ("cannot dereference out-of-range iterator"); ref_.copy(*iter_); From 6ab0a5d373fd945ed18ca3938de40c41b28dbcd1 Mon Sep 17 00:00:00 2001 From: rijobro Date: Fri, 17 May 2019 12:22:28 +0100 Subject: [PATCH 2/2] fix missing return in assignment constructor --- .../include/sirf/Gadgetron/gadgetron_data_containers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h b/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h index 1858e9b33..247768db4 100644 --- a/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h +++ b/src/xGadgetron/cGadgetron/include/sirf/Gadgetron/gadgetron_data_containers.h @@ -569,6 +569,7 @@ namespace sirf { iter_ = iter.iter_; end_ = iter.end_; sptr_iter_ = iter.sptr_iter_; + return *this; } bool operator==(const BaseIter_const& ai) const {