Merge branch 'next' into release/3.1.2

1 files changed, 7 insertions, 7 deletions

diff --git a/src/expr.cc b/src/expr.cc
index 85818e4b..c8945d3d 100644
--- a/src/expr.cc
+++ b/src/expr.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
@@ -94,9 +94,9 @@ void expr_t::parse(std::istream& in, const parse_flags_t& flags,
                    const optional<string>& original_string)
 {
   parser_t parser;
-  istream_pos_type start_pos = in.tellg();
+  std::istream::pos_type start_pos = in.tellg();
   ptr = parser.parse(in, flags, original_string);
-  istream_pos_type end_pos = in.tellg();
+  std::istream::pos_type end_pos = in.tellg();
 
   if (original_string) {
     set_text(*original_string);
@@ -290,10 +290,10 @@ value_t source_command(call_scope_t& args)
     in = &std::cin;
   }
 
-  symbol_scope_t   file_locals(args);
-  std::size_t      linenum = 0;
-  char             buf[4096];
-  istream_pos_type pos;
+  symbol_scope_t         file_locals(args);
+  std::size_t            linenum = 0;
+  char                   buf[4096];
+  std::istream::pos_type pos;
 
   while (in->good() && ! in->eof()) {
     pos = in->tellg();