From 6470a67461bfea2334404368e295ad09ad9b21f4 Mon Sep 17 00:00:00 2001 From: Tommi Rantala Date: Tue, 28 Aug 2012 16:51:41 +0300 Subject: [PATCH] Rename `backtrace' to `do_backtrace' in tests/Gtest-init.cxx Rename `backtrace' to `do_backtrace' in tests/Gtest-init.cxx for sanity; the `backtrace' name is already defined in various other places. --- tests/Gtest-init.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Gtest-init.cxx b/tests/Gtest-init.cxx index 18f14637..d238a08c 100644 --- a/tests/Gtest-init.cxx +++ b/tests/Gtest-init.cxx @@ -45,7 +45,7 @@ class Test_Class { static Test_Class t; static void -backtrace (void) +do_backtrace (void) { char name[128], off[32]; unw_word_t ip, offset; @@ -78,14 +78,14 @@ backtrace (void) static void b (void) { - backtrace(); + do_backtrace(); } static void a (void) { if (verbose) - printf ("backtrace() from atexit()-handler:\n"); + printf ("do_backtrace() from atexit()-handler:\n"); b(); if (errors) abort (); /* cannot portably call exit() from an atexit() handler */ @@ -94,7 +94,7 @@ a (void) Test_Class::Test_Class (void) { if (verbose) - printf ("backtrace() from constructor:\n"); + printf ("do_backtrace() from constructor:\n"); b(); }