changeset 1757:776389390473 by-id

Merge
author Chris Cannam
date Sat, 06 Jul 2019 18:12:54 +0100
parents 043e05c956fb (diff) fd7f127ecd89 (current diff)
children 83178b4bb698
files
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/base/test/TestById.h	Fri Jul 05 16:55:54 2019 +0100
+++ b/base/test/TestById.h	Sat Jul 06 18:12:54 2019 +0100
@@ -51,7 +51,8 @@
         A a;
         X x;
         if (a.getId().untyped == x.getUntypedId()) {
-            cerr << "ERROR: a and x have the same id: " << a.getId() << endl;
+            std::cerr << "ERROR: a and x have the same id: " << a.getId()
+                      << std::endl;
         }
         QVERIFY(a.getId().untyped != x.getUntypedId());
 
@@ -184,7 +185,8 @@
         AById::add(a);
         try {
             AById::add(a);
-            cerr << "Failed to catch expected exception in duplicateAdd" << endl;
+            std::cerr << "Failed to catch expected exception in duplicateAdd"
+                      << std::endl;
             QVERIFY(false);
         } catch (const std::logic_error &) {
         }
@@ -197,7 +199,8 @@
         AById::add(a);
         try {
             AById::release(b1);
-            cerr << "Failed to catch expected exception in unknownRelease" << endl;
+            std::cerr << "Failed to catch expected exception in unknownRelease"
+                      << std::endl;
             QVERIFY(false);
         } catch (const std::logic_error &) {
         }