commit f511e6a2fa049753f64bd737a4d74ff0f88cc611
author Dan Albert <danalbert@google.com> Fri Nov 28 05:34:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 28 05:34:39 2014 +0000
tree 8e6422ffa8c9ce13a2e9dd74acd39ee5d7ec4ec9
parent 50fd9b419e75a0468e89fee48a26c622edf03b75
parent 3a9bdae8f847b03c823a54d644d3f3962f0513fa

Merge "Fix build in C++11 mode"

tests/iptables/qtaguid/socketTag.cpp

diff --git a/tests/iptables/qtaguid/socketTag.cpp b/tests/iptables/qtaguid/socketTag.cpp
index 6cdc542..24a87e0 100644
--- a/tests/iptables/qtaguid/socketTag.cpp
+++ b/tests/iptables/qtaguid/socketTag.cpp
@@ -203,7 +203,7 @@
         valid_tag2 = ((uint64_t)my_pid << 48) | ((uint64_t)testRand() << 32);
         valid_tag2 &= 0xffffff00ffffffffllu;  // Leave some room to make counts visible.
         testPrintI("* start: pid=%lu uid=%lu uid1=0x%lx/%lu uid2=0x%lx/%lu"
-                   " tag1=0x%" PRIx64 "/%" PRIu64 " tag2=0x%" PRIx64 "/% "PRIu64,
+                   " tag1=0x%" PRIx64 "/%" PRIu64 " tag2=0x%" PRIx64 "/% " PRIu64,
                    (unsigned long)my_pid, (unsigned long)my_uid,
                    (unsigned long)fake_uid, (unsigned long)fake_uid,
                    (unsigned long)fake_uid2, (unsigned long)fake_uid2,