From 489faa4e8a06ecaf9a42924690b1978ede4c2a12 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 21 Nov 2017 14:07:17 +0200
Subject: Move eof() utility to libbutl

---
 build2/cc/compile.cxx | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'build2/cc/compile.cxx')

diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 0b9c20b..83230b2 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -2419,22 +2419,6 @@ namespace build2
                             fdstream_mode::text | fdstream_mode::skip,
                             ifdstream::badbit);
 
-              // If an input stream operation has failed, return true if
-              // because of the eof and throw is_error otherwise.
-              //
-              auto eof = [] (std::istream& is) -> bool
-              {
-                if (is.fail ())
-                {
-                  if (is.eof ())
-                    return true;
-
-                  throw io_error ("");
-                }
-
-                return false;
-              };
-
               // In some cases we may need to ignore the error return status.
               // The good_error flag keeps track of that. Similarly we
               // sometimes expect the error return status based on the output
@@ -2444,7 +2428,7 @@ namespace build2
 
               size_t skip (skip_count);
               string l; // Reuse.
-              for (bool first (true), second (false); !(restart || is.eof ());)
+              for (bool first (true), second (false); !restart; )
               {
                 if (eof (getline (is, l)))
                   break;
-- 
cgit v1.1