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/format.cc | |
| parent | 9de94d4adb7a566af38814f9d37e26c559b68b4f (diff) | |
| parent | 7a5871d3b53e66ee261bea4b41512e99269b18b1 (diff) | |
| download | fork-ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.gz fork-ledger-0bbb976ee3064ff59b319e30fd97e31020259760.tar.bz2 fork-ledger-0bbb976ee3064ff59b319e30fd97e31020259760.zip | |
Merge branch 'next' into release/3.1.2
Diffstat (limited to 'src/format.cc')
| -rw-r--r-- | src/format.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/format.cc b/src/format.cc index bb578141..5b9baa21 100644 --- a/src/format.cc +++ b/src/format.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 @@ -103,7 +103,7 @@ namespace { p += std::strlen(p); } else { assert(str.good()); - istream_pos_type pos = str.tellg(); + std::istream::pos_type pos = str.tellg(); expr.set_text(string(p, p + long(pos))); p += long(pos) - 1; |