X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;ds=sidebyside;f=tests%2Fexam_I_gcd.cc;h=09589dd91daf4cdee3e58f81e08fb43d2319b542;hb=c1e0f2a2e835ba016dc25276296bb0ee46329993;hp=9d2b7b4cff2044d304c6faec728dec76e0cb25f5;hpb=cd3c142f322d7da6af5e521d619a123f6d067f3c;p=cln.git

diff --git a/tests/exam_I_gcd.cc b/tests/exam_I_gcd.cc
index 9d2b7b4..09589dd 100644
--- a/tests/exam_I_gcd.cc
+++ b/tests/exam_I_gcd.cc
@@ -1,21 +1,20 @@
-#include <cl_integer.h>
-#include <cl_integer_io.h>
-#include <cl_io.h>
+#include <cln/integer.h>
+#include <cln/integer_io.h>
+#include <cln/io.h>
+
+using namespace std;
+using namespace cln;
 
 #define ASSERT(expr)  \
-  if (!(expr)) { 							\
-	fprint(cl_stderr,"Assertion failed! File ");			\
-	fprint(cl_stderr,__FILE__);					\
-	fprint(cl_stderr,", line ");					\
-	fprintdecimal(cl_stderr,__LINE__);				\
-	fprint(cl_stderr,".\n");					\
-	error = 1;							\
+  if (!(expr)) {                                        \
+	std::cerr << "Assertion failed! File " << __FILE__ << ", line " << __LINE__ << endl;    \
+	error = 1;                                      \
   }
 
 struct gcd_test {
 	const char * arg1;
-        const char * arg2;
-        const char * result;
+	const char * arg2;
+	const char * result;
 };
 
 #define num_elements(array)  (sizeof(array)/sizeof(array[0]))
@@ -32,16 +31,9 @@ static int test_##typename##_##opname (void)				\
 		rtype computed_result = opname(arg1,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;					\
 		}							\
 	}								\