# HG changeset patch
# User Chris Cannam
# Date 1562433174 -3600
# Node ID 7763893904730ad782b13ac823a5b5c95f33e299
# Parent  043e05c956fb7775afefa7efccb8abdf7164a1b1# Parent  fd7f127ecd89e87e6901dcaad2ac4c9d8209601c
Merge

diff -r fd7f127ecd89 -r 776389390473 base/test/TestById.h
--- 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 &) {
         }