diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-04 12:06:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-04 12:06:42 +0200 |
| commit | 403fa6b4a3cac18752ef70a282d7660c40e40035 (patch) | |
| tree | 17641f3e8531d91eff4a079c53cecb86ab5c1819 /src/serialization | |
| parent | 31bdf7bd113c2576fe579ef3a25a2d8fef419ffc (diff) | |
| parent | fec359a641986784c1f0e99ae215bcae9f4380bc (diff) | |
| download | monzero-core-403fa6b4a3cac18752ef70a282d7660c40e40035.tar.gz monzero-core-403fa6b4a3cac18752ef70a282d7660c40e40035.tar.xz monzero-core-403fa6b4a3cac18752ef70a282d7660c40e40035.zip | |
Merge pull request #5115
fec359a6 cryptonote: Fix enum check in expand_transaction_2 (Tom Smeding)
9bf0e537 cryptonote: Add const-qualifier on comparison functor (Tom Smeding)
5d2fdc2e serialization: Use pos_type instead of streampos (Tom Smeding)
Diffstat (limited to 'src/serialization')
| -rw-r--r-- | src/serialization/binary_archive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialization/binary_archive.h b/src/serialization/binary_archive.h index f47a4494d..242b8fd68 100644 --- a/src/serialization/binary_archive.h +++ b/src/serialization/binary_archive.h @@ -99,7 +99,7 @@ struct binary_archive<false> : public binary_archive_base<std::istream, false> { explicit binary_archive(stream_type &s) : base_type(s) { - stream_type::streampos pos = stream_.tellg(); + stream_type::pos_type pos = stream_.tellg(); stream_.seekg(0, std::ios_base::end); eof_pos_ = stream_.tellg(); stream_.seekg(pos); |