diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-15 06:28:30 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-15 06:28:30 -0400 |
| commit | be91f38ab4ccdba6006106d45fd7061db2110470 (patch) | |
| tree | 25874de7e90c34224c842e6b716ca9e82fe01028 /src/token.cc | |
| parent | f3bedb88b24ae8b2047ad86e57b161265c2812f5 (diff) | |
| parent | 968a6f3c0ac4690a6fc74e8d84058bce91019c2e (diff) | |
| download | fork-ledger-be91f38ab4ccdba6006106d45fd7061db2110470.tar.gz fork-ledger-be91f38ab4ccdba6006106d45fd7061db2110470.tar.bz2 fork-ledger-be91f38ab4ccdba6006106d45fd7061db2110470.zip | |
Merge branch 'next'
Diffstat (limited to 'src/token.cc')
| -rw-r--r-- | src/token.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/token.cc b/src/token.cc index 9dfff065..67cff65e 100644 --- a/src/token.cc +++ b/src/token.cc @@ -437,7 +437,7 @@ void expr_t::token_t::next(std::istream& in, const parse_flags_t& pflags, length = static_cast<std::size_t>(in.tellg() - pos); } } - catch (const std::exception& err) { + catch (const std::exception&) { kind = ERROR; length = static_cast<std::size_t>(in.tellg() - pos); throw; @@ -449,7 +449,7 @@ void expr_t::token_t::next(std::istream& in, const parse_flags_t& pflags, void expr_t::token_t::rewind(std::istream& in) { - in.seekg(- length, std::ios::cur); + in.seekg(- int(length), std::ios::cur); if (in.fail()) throw_(parse_error, _("Failed to rewind input stream")); } |