* */*: cl_istream -> std::istream, cl_ostream -> std::ostream.

[cln.git] / src / base / string / input / cl_st_getline1.cc

diff --git a/src/base/string/input/cl_st_getline1.cc b/src/base/string/input/cl_st_getline1.cc
index e3435c6bd6375cfa516dfce52ee1fe4d0e49d323..8ceb2daf8fe96bf15a9f962c1d41b0d0ce8301e1 100644 (file)
--- a/src/base/string/input/cl_st_getline1.cc
+++ b/src/base/string/input/cl_st_getline1.cc
@@ -4,24 +4,24 @@
 #include "cl_sysdep.h"
 
 // Specification.
-#include "cl_string.h"
+#include "cln/string.h"
 
 
 // Implementation.
 
-#ifdef CL_IO_IOSTREAM
-
-#include "cl_io.h"
+#include "cln/io.h"
 #include "cl_spushstring.h"
 
-const cl_string cl_fgetline (cl_istream stream, char delim)
+namespace cln {
+
+const cl_string cl_fgetline (std::istream& stream, char delim)
 {
        var cl_spushstring buffer;
        // Handling of eofp is tricky: EOF is reached when (!stream.good()) || (stream.get()==EOF).
        while (stream.good()) {
                var int c = stream.get();
                if (c==EOF)
-                       break;  // ios::eofbit already set
+                       break;  // std::ios::eofbit already set
                if (c==delim)
                        break;
                buffer.push(c);
@@ -29,4 +29,4 @@ const cl_string cl_fgetline (cl_istream stream, char delim)
        return buffer.contents();
 }
 
-#endif
+}  // namespace cln