From 3cf4199879c78627d7d7198952835a36e08240a6 Mon Sep 17 00:00:00 2001
From: Justin Viiret <justin.viiret@intel.com>
Date: Thu, 25 Aug 2016 13:26:27 +1000
Subject: [PATCH] debug: always use %zu in format string for size_t

---
 src/nfa/tamaramacompile.cpp       | 2 +-
 src/rose/rose_build_bytecode.cpp  | 8 ++++----
 src/rose/rose_build_exclusive.cpp | 6 +++---
 src/util/clique.cpp               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/nfa/tamaramacompile.cpp b/src/nfa/tamaramacompile.cpp
index 73d19595..521c9bb2 100644
--- a/src/nfa/tamaramacompile.cpp
+++ b/src/nfa/tamaramacompile.cpp
@@ -117,7 +117,7 @@ aligned_unique_ptr<NFA> buildTamarama(const TamaInfo &tamaInfo, const u32 queue,
     remapTops(tamaInfo, top_base, out_top_remap);
 
     size_t subSize = tamaInfo.subengines.size();
-    DEBUG_PRINTF("subSize:%lu\n", subSize);
+    DEBUG_PRINTF("subSize:%zu\n", subSize);
     size_t total_size =
         sizeof(NFA) +               // initial NFA structure
         sizeof(Tamarama) +          // Tamarama structure
diff --git a/src/rose/rose_build_bytecode.cpp b/src/rose/rose_build_bytecode.cpp
index d4f2e069..b8baa9c1 100644
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@ -1541,7 +1541,7 @@ void buildInfixContainer(RoseGraph &g, build_context &bc,
         for (const auto &sub : subengines) {
             const auto &verts = sub.vertices;
             for (const auto &v : verts) {
-                DEBUG_PRINTF("vert id:%lu\n", g[v].idx);
+                DEBUG_PRINTF("vert id:%zu\n", g[v].idx);
                 g[v].left.tamarama = tamaProto;
             }
         }
@@ -1560,7 +1560,7 @@ void buildSuffixContainer(RoseGraph &g, build_context &bc,
         for (const auto &sub : subengines) {
             const auto &verts = sub.vertices;
             for (const auto &v : verts) {
-                DEBUG_PRINTF("vert id:%lu\n", g[v].idx);
+                DEBUG_PRINTF("vert id:%zu\n", g[v].idx);
                 g[v].suffix.tamarama = tamaProto;
             }
             const auto &v = verts[0];
@@ -1741,7 +1741,7 @@ void findExclusiveInfixes(RoseBuildImpl &build, build_context &bc,
     }
 
     if (leftfixes.size() > 1) {
-        DEBUG_PRINTF("leftfix size:%lu\n", leftfixes.size());
+        DEBUG_PRINTF("leftfix size:%zu\n", leftfixes.size());
         vector<vector<u32>> groups;
         exclusiveAnalysisInfix(build, vertex_map, roleInfoSet, groups);
         buildExclusiveInfixes(build, bc, qif, infixTriggers, vertex_map,
@@ -2178,7 +2178,7 @@ void findExclusiveSuffixes(RoseBuildImpl &tbi, build_context &bc,
     }
 
     if (suffixes.size() > 1) {
-        DEBUG_PRINTF("suffix size:%lu\n", suffixes.size());
+        DEBUG_PRINTF("suffix size:%zu\n", suffixes.size());
         vector<vector<u32>> groups;
         exclusiveAnalysisSuffix(tbi, vertex_map, roleInfoSet, groups);
         buildExclusiveSuffixes(tbi, bc, qif, suffixTriggers, vertex_map,
diff --git a/src/rose/rose_build_exclusive.cpp b/src/rose/rose_build_exclusive.cpp
index c9e8d215..e91cc297 100644
--- a/src/rose/rose_build_exclusive.cpp
+++ b/src/rose/rose_build_exclusive.cpp
@@ -306,12 +306,12 @@ void findCliques(const map<u32, set<u32>> &exclusiveGroups,
     // Find clique groups
     const auto &clique = removeClique(*cg);
     for (const auto &i : clique) {
-        DEBUG_PRINTF("cliq:%lu\n", i.size());
+        DEBUG_PRINTF("cliq:%zu\n", i.size());
         if (i.size() > 1) {
             exclusive_roles.push_back(i);
         }
     }
-    DEBUG_PRINTF("Clique graph size:%lu\n", exclusive_roles.size());
+    DEBUG_PRINTF("Clique graph size:%zu\n", exclusive_roles.size());
 }
 
 static
@@ -326,7 +326,7 @@ map<u32, set<u32>> findExclusiveGroups(const RoseBuildImpl &build,
         set<u32> group;
         set<RoseVertex> q1(vertex_map.at(i).begin(),
                            vertex_map.at(i).end());
-        DEBUG_PRINTF("vertex set:%lu\n", q1.size());
+        DEBUG_PRINTF("vertex set:%zu\n", q1.size());
         for (const auto &val : s) {
             set<RoseVertex> q2(vertex_map.at(val).begin(),
                                vertex_map.at(val).end());
diff --git a/src/util/clique.cpp b/src/util/clique.cpp
index ea22779c..79f06932 100644
--- a/src/util/clique.cpp
+++ b/src/util/clique.cpp
@@ -103,7 +103,7 @@ bool graph_empty(const Graph &g) {
 }
 
 vector<vector<u32>> removeClique(CliqueGraph &cg) {
-    DEBUG_PRINTF("graph size:%lu\n", num_vertices(cg));
+    DEBUG_PRINTF("graph size:%zu\n", num_vertices(cg));
     vector<vector<u32>> cliquesVec = {findCliqueGroup(cg)};
     while (!graph_empty(cg)) {
         const vector<u32> &c = cliquesVec.back();