3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

result: make nested iterator C++20 conformant

Browse Source
This commit is contained in:
Théo Delrieu 2021-10-22 15:16:48 +02:00 committed by Roland Bock
parent 8572c821aa
commit 3f7fe2d0bb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/sqlpp11/result.h
View File

@ -93,7 +93,9 @@ namespace sqlpp
using reference = const result_row_t&; using reference = const result_row_t&;
using difference_type = std::ptrdiff_t; using difference_type = std::ptrdiff_t;
iterator(db_result_t& result, result_row_t& result_row) : _result(result), _result_row(result_row) iterator(std::reference_wrapper<db_result_t> result,
std::reference_wrapper<result_row_t> result_row) :
_result(std::move(result)), _result_row(std::move(result_row))
{ {
} }
@ -104,12 +106,12 @@ namespace sqlpp
pointer operator->() const pointer operator->() const
{ {
return &_result_row; return &_result_row.get();
} }
bool operator==(const iterator& rhs) const bool operator==(const iterator& rhs) const
{ {
return _result_row == rhs._result_row; return _result_row.get() == rhs._result_row.get();
} }
bool operator!=(const iterator& rhs) const bool operator!=(const iterator& rhs) const
@ -119,29 +121,29 @@ namespace sqlpp
iterator& operator++() iterator& operator++()
{ {
_result.next(_result_row); _result.get().next(_result_row.get());
return *this; return *this;
} }
iterator operator++(int) iterator operator++(int)
{ {
auto previous_it = *this; auto previous_it = *this;
_result.next(_result_row); _result.next(_result_row.get());
return previous_it; return previous_it;
} }
db_result_t& _result; std::reference_wrapper<db_result_t> _result;
result_row_t& _result_row; std::reference_wrapper<result_row_t> _result_row;
}; };
iterator begin() iterator begin()
{ {
return iterator(_result, _result_row); return iterator(std::ref(_result), std::ref(_result_row));
} }
iterator end() iterator end()
{ {
return iterator(_end, _end_row); return iterator(std::ref(_end), std::ref(_end_row));
} }
const result_row_t& front() const const result_row_t& front() const