diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2019-02-05 08:27:25 -0500 |
|---|---|---|
| committer | Martin Michlmayr <tbm@cyrius.com> | 2019-02-05 08:27:25 -0500 |
| commit | 0bbb976ee3064ff59b319e30fd97e31020259760 (patch) | |
| tree | 5d13986511c18d911b0d1b2dc498b0f81d3a3b0e /src/annotate.cc | |
| parent | 9de94d4adb7a566af38814f9d37e26c559b68b4f (diff) | |
| parent | 7a5871d3b53e66ee261bea4b41512e99269b18b1 (diff) | |
| download | ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.gz ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.bz2 ledger-0bbb976ee3064ff59b319e30fd97e31020259760.zip | |
Merge branch 'next' into release/3.1.2
Diffstat (limited to 'src/annotate.cc')
| -rw-r--r-- | src/annotate.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/annotate.cc b/src/annotate.cc index ab81d412..c5ccdf07 100644 --- a/src/annotate.cc +++ b/src/annotate.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2018, John Wiegley. All rights reserved. + * Copyright (c) 2003-2019, John Wiegley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -81,7 +81,7 @@ bool annotation_t::operator<(const annotation_t& rhs) const void annotation_t::parse(std::istream& in) { do { - istream_pos_type pos = in.tellg(); + std::istream::pos_type pos = in.tellg(); if (static_cast<int>(pos) < 0) return; |