* Change all C include headers to ISO style within C++ code.

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

diff --git a/src/base/string/input/cl_st_gettoken.cc b/src/base/string/input/cl_st_gettoken.cc
index 52139913965a776394b5a219e61cb852887d7c59..e845c13267abcb3f6e66af903cae0cba2e20b959 100644 (file)
--- a/src/base/string/input/cl_st_gettoken.cc
+++ b/src/base/string/input/cl_st_gettoken.cc
@@ -4,23 +4,18 @@
 #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"
-#include <ctype.h>
+#include <cctype>
 
-#if ((defined(__sparc__) || defined(__rs6000__) || defined(__mips__)) && !defined(__GNUC__))
-// Sun C++ doesn't have istream::unget().
-  #define unget()  putback(c)
-#endif
+namespace cln {
 
-cl_istream operator>> (cl_istream stream, cl_string& str)
+std::istream& operator>> (std::istream& stream, cl_string& str)
 {
        var cl_spushstring buffer;
        var int n = stream.width();
@@ -62,4 +57,4 @@ cl_istream operator>> (cl_istream stream, cl_string& str)
        return stream;
 }
 
-#endif
+}  // namespace cln