Changeset 6802

Timestamp:

07/09/10 17:41:04 (21 months ago)

Author:

westram

Message:

• removed a few superfluous LFs (introduced in [6801])

Location:

branches/refactor/UNIT_TESTER

Files:

• test_global.h (modified) (2 diffs)
• test_unit.h (modified) (3 diffs)

branches/refactor/UNIT_TESTER/test_global.h

@@ -57 +57 @@
 
 namespace arb_test {
-    class FlushedOutputNoNewline {
+    class FlushedOutputNoLF {
         inline void flushall() { fflush(stdout); fflush(stderr); }
     public:
-        FlushedOutputNoNewline() { flushall(); }
-        ~FlushedOutputNoNewline() { flushall(); }
+        FlushedOutputNoLF() { flushall(); }
+        ~FlushedOutputNoLF() { flushall(); }
     };
-    struct FlushedOutput : public FlushedOutputNoNewline {
+    struct FlushedOutput : public FlushedOutputNoLF {
         ~FlushedOutput() { fputc('\n', stderr); }
     };
-        
+
     class GlobalTestData {
         GlobalTestData()
@@ -98 +98 @@
         static void assertfailmsg(const char *filename, int lineno, const char *condition) {
             FlushedOutput yes;
-            fprintf(stderr, "%s:%i: Assertion '%s' failed\n", filename, lineno, condition);
+            fprintf(stderr, "%s:%i: Assertion '%s' failed", filename, lineno, condition);
         }
     };

branches/refactor/UNIT_TESTER/test_unit.h

@@ -51 +51 @@
 
         static void printf(const char *format, ...) __attribute__((format(printf, 1, 2))) {
-            FlushedOutputNoNewline yes;
+            FlushedOutputNoLF yes;
             VPRINTFORMAT(format);
         }
@@ -113 +113 @@
     }
     template <typename T1, typename T2> void print_failed_equal(T1 t1, T2 t2) {
-        FlushedOutput yes;
+        FlushedOutputNoLF yes;
         fputs("is_equal(", stderr);
         print_pair(t1, t2);
@@ -199 +199 @@
     }
 
-    
+
 
     inline bool files_are_equal(const char *file1, const char *file2) {
-        const char    *error = NULL;
-        FILE          *fp1   = fopen(file1, "rb");
-        FlushedOutput  yes;
+        const char        *error = NULL;
+        FILE              *fp1   = fopen(file1, "rb");
+        FlushedOutputNoLF  yes;
 
         if (!fp1) {