Changes required to fix compilation errors under DevToolset4 on CentO…

…S, gcc 5.2.1 https://www.softwarecollections.org/en/scls/rhscl/devtoolset-4/
pianofab · Aug 24, 2016 · f3d1d66 · f3d1d66
1 parent 75a9113
commit f3d1d66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/heaptrack_interpret.cpp b/heaptrack_interpret.cpp
@@ -30,7 +30,7 @@
 #include <tuple>
 #include <algorithm>
 #include <stdio_ext.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <cxxabi.h>
 

diff --git a/libheaptrack.cpp b/libheaptrack.cpp
@@ -37,6 +37,7 @@
 #include <unordered_set>
 #include <mutex>
 #include <thread>
+#include <cinttypes>
 
 #include <boost/algorithm/string/replace.hpp>
 

diff --git a/tracetree.h b/tracetree.h
@@ -76,7 +76,7 @@ class TraceTree
             if (it == parent->children.end() || it->instructionPointer != ip) {
                 index = m_index++;
                 it = parent->children.insert(it, {ip, index, {}});
-                fprintf(out, "t %" PRIxPTR " %x\n", reinterpret_cast<uintptr_t>(ip), parent->index);
+                fprintf(out, "t %p %x\n", ip, parent->index);
             }
             index = it->index;
             parent = &(*it);