diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-12 20:17:44 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-12 20:17:44 -0400 |
| commit | 247ee8ef743f46418ca846def20be1cc3a3ade18 (patch) | |
| tree | 638c327fdf68f9a5cb3ebf6fcbf82c7ee337620f | |
| parent | c6e85efc50601320c51c1314768715a1348b4f26 (diff) | |
| parent | 74db8adfbc5e136b55d2f5ea54d49f67b15d7fea (diff) | |
| download | gem5-247ee8ef743f46418ca846def20be1cc3a3ade18.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : db68adffdf4ae12637eba7c03d53aca997b30291
| -rw-r--r-- | src/base/cprintf.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/base/cprintf.hh b/src/base/cprintf.hh index 7f8e33367..cff73a228 100644 --- a/src/base/cprintf.hh +++ b/src/base/cprintf.hh @@ -143,20 +143,20 @@ ccprintf(std::ostream &stream, const std::string &format, inline void ccprintf(std::ostream &stream, const std::string &format, CPRINTF_DECLARATION) { - ccprintf(stream, format, VARARGS_ALLARGS); + ccprintf(stream, format.c_str(), VARARGS_ALLARGS); } inline void cprintf(const std::string &format, CPRINTF_DECLARATION) { - ccprintf(std::cout, format, VARARGS_ALLARGS); + ccprintf(std::cout, format.c_str(), VARARGS_ALLARGS); } inline std::string csprintf(const std::string &format, CPRINTF_DECLARATION) { std::stringstream stream; - ccprintf(stream, format, VARARGS_ALLARGS); + ccprintf(stream, format.c_str(), VARARGS_ALLARGS); return stream.str(); } |