From e97d5ed3ebc4f4e931635101800d3dbec0575cf1 Mon Sep 17 00:00:00 2001 From: Philippe Waroquiers Date: Wed, 22 Jul 2015 21:37:06 +0000 Subject: [PATCH] Unbreak the build on several setups : It looks like the standard says that #define __STDC_FORMAT_MACROS is needed in c++ in order to have PRIxPTR defined. At least on gcc110 g++ 4.7.2, leak_cpp_interior.cpp was not compiling. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15435 --- memcheck/tests/leak_cpp_interior.cpp | 1 + memcheck/tests/leak_cpp_interior.stderr.exp | 4 ++-- memcheck/tests/leak_cpp_interior.stderr.exp-64bit | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp index 497fa8700..f66fc8946 100644 --- a/memcheck/tests/leak_cpp_interior.cpp +++ b/memcheck/tests/leak_cpp_interior.cpp @@ -1,3 +1,4 @@ +#define __STDC_FORMAT_MACROS #include #include #include diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp index 2ab278734..3228f7483 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp +++ b/memcheck/tests/leak_cpp_interior.stderr.exp @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 4 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:114) - by 0x........: main (leak_cpp_interior.cpp:129) + by 0x........: doit() (leak_cpp_interior.cpp:115) + by 0x........: main (leak_cpp_interior.cpp:130) LEAK SUMMARY: definitely lost: 4 bytes in 1 blocks diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit index 8bc77a4cf..7a862a3cc 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit +++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 8 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:114) - by 0x........: main (leak_cpp_interior.cpp:129) + by 0x........: doit() (leak_cpp_interior.cpp:115) + by 0x........: main (leak_cpp_interior.cpp:130) LEAK SUMMARY: definitely lost: 8 bytes in 1 blocks