X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=tests%2Fexam.h;h=b46fe891167096ebbbb01c8ae92feac7917a67b4;hb=282db927376617d23f155836c5872b475ab4f0bb;hp=6d5b2dc445455c850681b6ed20726da94fa4fabb;hpb=dd9e0f894eec7e2a8cf85078330ddc0a6639090b;p=cln.git

diff --git a/tests/exam.h b/tests/exam.h
index 6d5b2dc..b46fe89 100644
--- a/tests/exam.h
+++ b/tests/exam.h
@@ -1,8 +1,10 @@
 #ifndef _EXAM_H
 #define _EXAM_H
 
-#include <cl_number.h>
-#include <cl_io.h>
+#include <cln/number.h>
+#include <cln/io.h>
+using namespace std;
+using namespace cln;
 
 // Michael Stoll  23. 3. 1993
 // C++ version: Bruno Haible 1.11.1995
@@ -51,16 +53,9 @@ static int test_##typename##_##opname (void)				\
 		rtype computed_result = arg1 op arg2;			\
 		rtype result = rtype(test.result);			\
 		if (computed_result != result) {			\
-			fprint(cl_stderr, "Error in " #typename "_" #opname "_tests["); \
-			fprintdecimal(cl_stderr, i);			\
-			fprint(cl_stderr, "] !\n");			\
-			fprint(cl_stderr, "Result should be: ");	\
-			fprint(cl_stderr, result);			\
-			fprint(cl_stderr, "\n");			\
-			fprint(cl_stderr, "Result computed : ");	\
-			fprint(cl_stderr, computed_result);		\
-			fprint(cl_stderr, "\n");			\
-			fprint(cl_stderr, "\n");			\
+			std::cerr << "Error in " #typename "_" #opname "_tests[" << i << "] !" << endl; \
+			std::cerr << "Result should be: " << result << endl;	\
+			std::cerr << "Result computed : " << computed_result << endl << endl;	\
 			error = 1;					\
 		}							\
 	}								\
@@ -79,20 +74,9 @@ static int test_##typename##_floor (void)				\
 		cl_I result1 = cl_I(test.result1);			\
 		type result2 = type(test.result2);			\
 		if ((computed_result.quotient != result1) || (computed_result.remainder != result2)) { \
-			fprint(cl_stderr, "Error in " #typename "_floor_tests["); \
-			fprintdecimal(cl_stderr, i);			\
-			fprint(cl_stderr, "] !\n");			\
-			fprint(cl_stderr, "Results should be: ");	\
-			fprint(cl_stderr, result1);			\
-			fprint(cl_stderr, ", ");			\
-			fprint(cl_stderr, result2);			\
-			fprint(cl_stderr, "\n");			\
-			fprint(cl_stderr, "Results computed : ");	\
-			fprint(cl_stderr, computed_result.quotient);	\
-			fprint(cl_stderr, ", ");			\
-			fprint(cl_stderr, computed_result.remainder);	\
-			fprint(cl_stderr, "\n");			\
-			fprint(cl_stderr, "\n");			\
+			std::cerr << "Error in " #typename "_floor_tests[" << i << endl; \
+			std::cerr << "Results should be: " << result1 << ", " << result2 << endl;	\
+			std::cerr << "Results computed : " << computed_result.quotient << ", " << computed_result.remainder << endl << endl;	\
 			error = 1;					\
 		}							\
 	}								\