diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-01-11 21:22:33 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-01-11 21:22:33 -0500 |
| commit | b4301c652cf09a7464a360a403cb25ad214909f5 (patch) | |
| tree | f24311aef29908485ce7059a72bc6eec25d90035 /base/cprintf_formats.hh | |
| parent | a3691fe09e663871d4dd46c4fcc05407ac8c448a (diff) | |
| parent | f8ed615bc65139076289e8af4bc6c7908aae4aa8 (diff) | |
| download | gem5-b4301c652cf09a7464a360a403cb25ad214909f5.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : bff2fb78e205f327ce8d04f3ae1b2352857ab824
Diffstat (limited to 'base/cprintf_formats.hh')
| -rw-r--r-- | base/cprintf_formats.hh | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/base/cprintf_formats.hh b/base/cprintf_formats.hh index 1e5de4fdf..b921c0506 100644 --- a/base/cprintf_formats.hh +++ b/base/cprintf_formats.hh @@ -43,8 +43,10 @@ struct Format int precision; int width; - Format() { } - void clear() { + Format() { clear(); } + + void clear() + { alternate_form = false; flush_left = false; print_sign = false; @@ -58,15 +60,6 @@ struct Format } }; -inline void -format_invalid(std::ostream &out) -{ - using namespace std; - - out << "format invalid!!!" << endl; -} - - template <typename T> inline void _format_char(std::ostream &out, const T& data, Format &fmt) @@ -233,7 +226,7 @@ _format_string(std::ostream &out, const T& data, Format &fmt) template <typename T> inline void format_char(std::ostream &out, const T& data, Format &fmt) -{ format_invalid(out); } +{ out << "<bad arg type for char format>"; } inline void format_char(std::ostream &out, char data, Format &fmt) @@ -329,7 +322,7 @@ format_integer(std::ostream &out, unsigned long long data, Format &fmt) template <typename T> inline void format_float(std::ostream &out, const T& data, Format &fmt) -{ format_invalid(out); } +{ out << "<bad arg type for float format>"; } inline void format_float(std::ostream &out, float data, Format &fmt) |