From 890d504362339a8fe06b16d213a642494ee42eab Mon Sep 17 00:00:00 2001 From: Mark Woolrich <woolrich@fmrib.ox.ac.uk> Date: Fri, 13 Sep 2002 16:24:17 +0000 Subject: [PATCH] *** empty log message *** --- log.h | 14 ++++++++++++++ time_tracer.h | 18 +++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/log.h b/log.h index 015828a..7ca1ba4 100644 --- a/log.h +++ b/log.h @@ -50,6 +50,17 @@ namespace Utilities{ return log; } + template<class t> Log& operator<<(Log& log, t& obj) + { + if(log.stream_to_logfile) + log.logfileout << obj; + + if(log.stream_to_cout) + cout << obj; + + return log; + } + class Log { public: @@ -123,6 +134,9 @@ namespace Utilities{ template<class t> friend Log& operator<<(Log& log, const t& obj); + + template<class t> + friend Log& operator<<(Log& log, t& obj); }; class LogSingleton diff --git a/time_tracer.h b/time_tracer.h index 5e25e10..44616a4 100644 --- a/time_tracer.h +++ b/time_tracer.h @@ -84,15 +84,17 @@ namespace Utilities{ if(instantstack || runningstack) { - tmp = ""; - pad++; - for(unsigned int i = 0; i < pad; i++) - tmp = tmp + " "; - stk.push(string(str)); if(runningstack) - cout << tmp << str << endl; + { + tmp = ""; + pad++; + for(unsigned int i = 0; i < pad; i++) + tmp = tmp + " "; + + cout << tmp << str << endl; + } } if(timingon) { @@ -116,7 +118,9 @@ namespace Utilities{ virtual ~Time_Tracer() { if(instantstack) - stk.pop(); + { + stk.pop(); + } if(runningstack && pad > 0) { -- GitLab