stackprof: demo c++20 format{}

diff --git a/src/Makefile.am b/src/Makefile.am
index 13a8289d0bc4d9d5f4a33c0b38c0687d037ad897..e0bddb57dd8010acaa8df80e7ccb58ee4962a874 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,8 +116,8 @@ elfclassify_LDADD = $(libelf) $(libdw) $(libeu) $(argp_LDADD)
 srcfiles_SOURCES = srcfiles.cxx
 srcfiles_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(libarchive_LIBS) $(libdebuginfod)
 stackprof_SOURCES = stackprof.cxx
-stackprof_CPPFLAGS = $(jsonc_CXXFLAGS)
-stackprof_CXXFLAGS = -std=c++11 -Wall
+stackprof_CPPFLAGS = $(AM_CPPFLAGS) $(jsonc_CXXFLAGS)
+stackprof_CXXFLAGS = -Wall
 stackprof_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(libpfm_LIBS) $(jsonc_LIBS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)

diff --git a/src/stackprof.cxx b/src/stackprof.cxx
index 98c266f2a68a456a39ee18cd9ba870762390cd6f..b90c04a1083c7d92306e562c45d758a3c7582885 100644 (file)
--- a/src/stackprof.cxx
+++ b/src/stackprof.cxx
@@ -41,6 +41,7 @@
 #include <fstream>
 #include <sstream>
 #include <cinttypes>
+#include <format>
 #include <sys/utsname.h>
 
 #include <sys/syscall.h>
@@ -793,7 +794,7 @@ PerfReader::PerfReader(perf_event_attr* attr, PerfConsumer* consumer, int pid)
       for (size_t x = 0; x<sizeof(*attr); x++)
        cout << ((x % 8) ? "" : " ")
             << ((x % 32) ? "" : "\n")
-            << hex << setw(2) << setfill('0') << (unsigned)bytes[x];
+            << format("{:02x}", (unsigned)bytes[x]);
       cout << endl;
       clog.setf(oldf);
     }