From 54907d2a1aefba1a4fb34ebd26b9227534908a1c Mon Sep 17 00:00:00 2001
From: Jeremy B <97525434+42jeremy@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:19:15 +0100
Subject: [PATCH 1/5] Update src/query/v2/multiframe.cpp
Co-authored-by: Kostas Kyrimis <kostaskyrim@gmail.com>
---
src/query/v2/multiframe.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/query/v2/multiframe.cpp b/src/query/v2/multiframe.cpp
index 27b0872ed..05d2a755b 100644
--- a/src/query/v2/multiframe.cpp
+++ b/src/query/v2/multiframe.cpp
@@ -57,7 +57,6 @@ void MultiFrame::DefragmentValidFrames() noexcept {
in the range in such a way that the elements that are not to be removed appear in the beginning of the range.
Relative order of the elements that remain is preserved and the physical size of the container is unchanged."
*/
- [[maybe_unused]] const auto it =
std::remove_if(frames_.begin(), frames_.end(), [](auto &frame) { return !frame.IsValid(); });
}
From d0c960e90036dcf4a8422441039a3108009010ea Mon Sep 17 00:00:00 2001
From: Jeremy B <97525434+42jeremy@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:20:19 +0100
Subject: [PATCH 2/5] Update src/query/v2/multiframe.hpp
Co-authored-by: Kostas Kyrimis <kostaskyrim@gmail.com>
---
src/query/v2/multiframe.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp
index 5583e80f3..5651365a7 100644
--- a/src/query/v2/multiframe.hpp
+++ b/src/query/v2/multiframe.hpp
@@ -33,7 +33,7 @@ class MultiFrame {
MultiFrame(int64_t size_of_frame, size_t number_of_frames, utils::MemoryResource *execution_memory);
~MultiFrame() = default;
- MultiFrame(const MultiFrame &other); // copy constructor
+ MultiFrame(const MultiFrame &other);
MultiFrame(MultiFrame &&other) noexcept; // move constructor
MultiFrame &operator=(const MultiFrame &other) = delete;
MultiFrame &operator=(MultiFrame &&other) noexcept = delete;
From ee9ba1a7f8a2f5f6559c05a0673e4f27dba2b92e Mon Sep 17 00:00:00 2001
From: Jeremy B <97525434+42jeremy@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:20:26 +0100
Subject: [PATCH 3/5] Update src/query/v2/multiframe.hpp
Co-authored-by: Kostas Kyrimis <kostaskyrim@gmail.com>
---
src/query/v2/multiframe.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp
index 5651365a7..782a1e8fc 100644
--- a/src/query/v2/multiframe.hpp
+++ b/src/query/v2/multiframe.hpp
@@ -34,7 +34,7 @@ class MultiFrame {
~MultiFrame() = default;
MultiFrame(const MultiFrame &other);
- MultiFrame(MultiFrame &&other) noexcept; // move constructor
+ MultiFrame(MultiFrame &&other) noexcept;
MultiFrame &operator=(const MultiFrame &other) = delete;
MultiFrame &operator=(MultiFrame &&other) noexcept = delete;
From 6c441b80ec3b2f0bbf53b318807fc9b743304561 Mon Sep 17 00:00:00 2001
From: Jeremy B <97525434+42jeremy@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:20:57 +0100
Subject: [PATCH 4/5] Update src/query/v2/multiframe.hpp
Co-authored-by: Kostas Kyrimis <kostaskyrim@gmail.com>
---
src/query/v2/multiframe.hpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp
index 782a1e8fc..f0219c7df 100644
--- a/src/query/v2/multiframe.hpp
+++ b/src/query/v2/multiframe.hpp
@@ -90,10 +90,10 @@ class ValidFramesReader {
explicit ValidFramesReader(MultiFrame &multiframe);
~ValidFramesReader() = default;
- ValidFramesReader(const ValidFramesReader &other) = delete; // copy constructor
- ValidFramesReader(ValidFramesReader &&other) noexcept = delete; // move constructor
- ValidFramesReader &operator=(const ValidFramesReader &other) = delete; // copy assignment
- ValidFramesReader &operator=(ValidFramesReader &&other) noexcept = delete; // move assignment
+ ValidFramesReader(const ValidFramesReader &other) = delete;
+ ValidFramesReader(ValidFramesReader &&other) noexcept = delete;
+ ValidFramesReader &operator=(const ValidFramesReader &other) = delete;
+ ValidFramesReader &operator=(ValidFramesReader &&other) noexcept = delete;
struct Iterator {
using iterator_category = std::forward_iterator_tag;
From 452722f4f8067831996a2d576eb48ec62b98ad90 Mon Sep 17 00:00:00 2001
From: Jeremy B <97525434+42jeremy@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:52:30 +0100
Subject: [PATCH 5/5] Update src/query/v2/multiframe.hpp
Co-authored-by: Kostas Kyrimis <kostaskyrim@gmail.com>
---
src/query/v2/multiframe.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/query/v2/multiframe.hpp b/src/query/v2/multiframe.hpp
index f0219c7df..852674c8c 100644
--- a/src/query/v2/multiframe.hpp
+++ b/src/query/v2/multiframe.hpp
@@ -159,7 +159,7 @@ class ValidFramesModifier {
Iterator &operator++() {
do {
ptr_++;
- } while (*this != iterator_wrapper_.end() && !this->ptr_->IsValid());
+ } while (*this != iterator_wrapper_.end() && ptr_->IsValid());
return *this;
}