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

[cln.git] / include / cln / integer_io.h

diff --git a/include/cln/integer_io.h b/include/cln/integer_io.h
index 783c7cf57df4766a6d44e0e62e8cd07654b0fbc5..dc1a59986c3360a0aa539a4de0847ee48600a33d 100644 (file)
--- a/include/cln/integer_io.h
+++ b/include/cln/integer_io.h
@@ -27,11 +27,11 @@ extern const cl_I read_integer (unsigned int base,
 // It is here only so that you don't need the rational, complex and float number
 // readers in order to read an integer. ("Treeshaking")
 extern const cl_I read_integer (const cl_read_flags& flags, const char * string, const char * string_limit, const char * * end_of_parse);
-extern const cl_I read_integer (cl_istream stream, const cl_read_flags& flags);
+extern const cl_I read_integer (std::istream& stream, const cl_read_flags& flags);
 
 // Documented input functions
 
-inline cl_istream operator>> (cl_istream stream, cl_I& result)
+inline std::istream& operator>> (std::istream& stream, cl_I& result)
 {
        extern cl_read_flags cl_I_read_flags;
        result = read_integer(stream,cl_I_read_flags);
@@ -51,29 +51,29 @@ extern char * cl_decimal_string (const cl_I& x);
 // > z: Integer
 // > base: Basis (>=2, <=36)
 // > stream: Stream
-extern void print_integer (cl_ostream stream, unsigned int base, const cl_I& z);
+extern void print_integer (std::ostream& stream, unsigned int base, const cl_I& z);
 // Dasselbe als String. Mit malloc_hook() alloziert, mit free_hook() freizugeben.
 extern char * print_integer_to_string (unsigned int base, const cl_I& z);
 
 
 // Documented output functions
 
-inline void fprintdecimal (cl_ostream stream, const cl_I& x)
+inline void fprintdecimal (std::ostream& stream, const cl_I& x)
 {
        print_integer(stream,10,x);
 }
 
-inline void fprintbinary (cl_ostream stream, const cl_I& x)
+inline void fprintbinary (std::ostream& stream, const cl_I& x)
 {
        print_integer(stream,2,x);
 }
 
-inline void fprintoctal (cl_ostream stream, const cl_I& x)
+inline void fprintoctal (std::ostream& stream, const cl_I& x)
 {
        print_integer(stream,8,x);
 }
 
-inline void fprinthexadecimal (cl_ostream stream, const cl_I& x)
+inline void fprinthexadecimal (std::ostream& stream, const cl_I& x)
 {
        print_integer(stream,16,x);
 }
@@ -83,16 +83,16 @@ inline void fprinthexadecimal (cl_ostream stream, const cl_I& x)
 // > z: Zahl
 // > stream: Stream
 // > flags: Ausgabe-Parameter
-extern void print_integer (cl_ostream stream, const cl_print_flags& flags, const cl_I& z);
-extern void print_integer (cl_ostream stream, const cl_print_number_flags& flags, const cl_I& z);
-extern void print_integer (cl_ostream stream, const cl_print_real_flags& flags, const cl_I& z);
-extern void print_integer (cl_ostream stream, const cl_print_rational_flags& flags, const cl_I& z);
+extern void print_integer (std::ostream& stream, const cl_print_flags& flags, const cl_I& z);
+extern void print_integer (std::ostream& stream, const cl_print_number_flags& flags, const cl_I& z);
+extern void print_integer (std::ostream& stream, const cl_print_real_flags& flags, const cl_I& z);
+extern void print_integer (std::ostream& stream, const cl_print_rational_flags& flags, const cl_I& z);
 
 // The following does strictly the same as the general `fprint' for numbers.
 // It is here only so that you don't need the rational number printer
 // in order to print an integer. ("Treeshaking")
 
-inline void fprint (cl_ostream stream, const cl_I& x)
+inline void fprint (std::ostream& stream, const cl_I& x)
 {
        extern cl_print_flags default_print_flags;
        print_integer(stream,default_print_flags,x);