From 96936c6bf57b40c6da2582ad6dd1bdd0de2ea3db Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 10 Oct 2008 12:17:53 -0700 Subject: [PATCH] Rename the info function to inform to avoid likely name conflicts --- src/base/misc.hh | 4 ++-- src/sim/simulate.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/misc.hh b/src/base/misc.hh index 5bb4e0e77..25dcbaa62 100644 --- a/src/base/misc.hh +++ b/src/base/misc.hh @@ -135,14 +135,14 @@ extern bool want_hack, hack_verbose; #define warn(...) \ cond_message(want_warn, std::cerr, "warn", warn_verbose, __VA_ARGS__) -#define info(...) \ +#define inform(...) \ cond_message(want_info, std::cout, "info", info_verbose, __VA_ARGS__) #define hack(...) \ cond_message(want_hack, std::cerr, "hack", hack_verbose, __VA_ARGS__) #define warn_once(...) \ cond_message_once(want_warn, std::cerr, "warn", warn_verbose, __VA_ARGS__) -#define info_once(...) \ +#define inform_once(...) \ cond_message_once(want_info, std::cout, "info", info_verbose, __VA_ARGS__) #define hack_once(...) \ cond_message_once(want_hack, std::cerr, "hack", hack_verbose, __VA_ARGS__) diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc index 7f40805e6..9af873f90 100644 --- a/src/sim/simulate.cc +++ b/src/sim/simulate.cc @@ -47,7 +47,7 @@ SimLoopExitEvent * simulate(Tick num_cycles) { - info("Entering event queue @ %d. Starting simulation...\n", curTick); + inform("Entering event queue @ %d. Starting simulation...\n", curTick); if (num_cycles < 0) fatal("simulate: num_cycles must be >= 0 (was %d)\n", num_cycles);