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

Replace reference wrapper with pointer in result_t::iterator, preparing for support for default initialization.

Browse Source
This commit is contained in:
MeanSquaredError 2024-08-31 23:31:56 +03:00 committed by Roland Bock
parent 0a2765d588
commit 5224d6a733
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/sqlpp11/result.h
View File

@ -93,25 +93,24 @@ 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(std::reference_wrapper<db_result_t> result, iterator(db_result_t& result, result_row_t& result_row)
std::reference_wrapper<result_row_t> result_row) : : _result_ptr(&result), _result_row_ptr(&result_row)
_result(std::move(result)), _result_row(std::move(result_row))
{ {
} }
reference operator*() const reference operator*() const
{ {
return _result_row; return *_result_row_ptr;
} }
pointer operator->() const pointer operator->() const
{ {
return &_result_row.get(); return _result_row_ptr;
} }
bool operator==(const iterator& rhs) const bool operator==(const iterator& rhs) const
{ {
return _result_row.get() == rhs._result_row.get(); return *_result_row_ptr == *rhs._result_row_ptr;
} }
bool operator!=(const iterator& rhs) const bool operator!=(const iterator& rhs) const
@ -121,7 +120,7 @@ namespace sqlpp
iterator& operator++() iterator& operator++()
{ {
_result.get().next(_result_row.get()); _result_ptr->next(*_result_row_ptr);
return *this; return *this;
} }
@ -137,18 +136,19 @@ namespace sqlpp
++*this; ++*this;
} }
std::reference_wrapper<db_result_t> _result; // Use T* instead of T& for default-constructibility
std::reference_wrapper<result_row_t> _result_row; db_result_t* _result_ptr;
result_row_t* _result_row_ptr;
}; };
iterator begin() iterator begin()
{ {
return iterator(std::ref(_result), std::ref(_result_row)); return iterator(_result, _result_row);
} }
iterator end() iterator end()
{ {
return iterator(std::ref(_end), std::ref(_end_row)); return iterator(_end, _end_row);
} }
const result_row_t& front() const const result_row_t& front() const