Skip to content
Snippets Groups Projects

F update

All threads resolved!
Merged Timm Fitschen requested to merge f-update into dev
All threads resolved!
Files
3
@@ -31,7 +31,6 @@
#include "caosdb/transaction_status.h" // for TransactionStatus
#include "caosdb/status_code.h" // for StatusCode
#include "google/protobuf/util/json_util.h" // for MessageToJsonString, Jso...
#include <cstddef> // for size_t
#include <iterator>
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <memory> // for shared_ptr, unique_ptr
@@ -180,7 +179,7 @@ class ResultSet {
public:
virtual ~ResultSet() = default;
[[nodiscard]] virtual auto Size() const noexcept -> size_t = 0;
[[nodiscard]] virtual auto Size() const noexcept -> int = 0;
[[nodiscard]] virtual auto At(const int index) const -> const Entity & = 0;
auto begin() const -> iterator;
auto end() const -> iterator;
@@ -188,14 +187,14 @@ public:
private:
class iterator : public std::iterator<std::output_iterator_tag, Entity> {
public:
explicit iterator(const ResultSet *result_set, size_t index = 0);
explicit iterator(const ResultSet *result_set, int index = 0);
auto operator*() const -> const Entity &;
auto operator++() -> iterator &;
auto operator++(int) -> iterator;
auto operator!=(const iterator &rhs) const -> bool;
private:
size_t current_index = 0;
int current_index = 0;
const ResultSet *result_set;
};
};
@@ -210,7 +209,7 @@ class MultiResultSet : public ResultSet {
public:
~MultiResultSet() = default;
explicit MultiResultSet(MultiTransactionResponse *response);
[[nodiscard]] inline auto Size() const noexcept -> size_t override {
[[nodiscard]] inline auto Size() const noexcept -> int override {
return this->entities.size();
}
[[nodiscard]] inline auto At(const int index) const
@@ -234,9 +233,7 @@ public:
explicit inline UniqueResult(IdResponse *idResponse)
: entity(new Entity(idResponse)){};
[[nodiscard]] auto GetEntity() const -> const Entity &;
[[nodiscard]] inline auto Size() const noexcept -> size_t override {
return 1;
}
[[nodiscard]] inline auto Size() const noexcept -> int override { return 1; }
[[nodiscard]] inline auto At(const int index) const
-> const Entity & override {
if (index != 0) {
Loading