43a44
> std::ostream &out = Trace::output();
46,48c47,49
< ios::fmtflags saved_flags = DebugOut().flags();
< char old_fill = DebugOut().fill();
< int old_precision = DebugOut().precision();
---
> ios::fmtflags saved_flags = out.flags();
> char old_fill = out.fill();
> int old_precision = out.precision();
121c122
< DebugOut() << hex;
---
> out << hex;
124c125
< DebugOut() << oct;
---
> out << oct;
128c129
< DebugOut().setf(ios::showbase);
---
> out.setf(ios::showbase);
131c132
< DebugOut() << "0x";
---
> out << "0x";
134c135
< DebugOut() << "0";
---
> out << "0";
141c142
< DebugOut().fill('0');
---
> out.fill('0');
144c145
< DebugOut().width(width);
---
> out.width(width);
147c148
< DebugOut().setf(ios::left);
---
> out.setf(ios::left);
151c152
< DebugOut() << (int64_t)args;
---
> out << (int64_t)args;
153c154
< DebugOut() << (int32_t)args;
---
> out << (int32_t)args;
156c157
< DebugOut() << (uint64_t)args;
---
> out << (uint64_t)args;
158c159
< DebugOut() << (uint32_t)args;
---
> out << (uint32_t)args;
162c163
< DebugOut().fill(' ');
---
> out.fill(' ');
165c166
< DebugOut().width(0);
---
> out.width(0);
167c168
< DebugOut() << dec;
---
> out << dec;
179c180
< DebugOut().width(width);
---
> out.width(width);
181c182
< DebugOut().setf(ios::left);
---
> out.setf(ios::left);
183c184
< DebugOut() << s;
---
> out << s;
204c205
< DebugOut() << c;
---
> out << c;
214c215
< DebugOut() << s << ": " << n;
---
> out << s << ": " << n;
236c237
< DebugOut() << '%';
---
> out << '%';
243c244
< DebugOut() << endl;
---
> out << endl;
249c250
< DebugOut() << endl;
---
> out << endl;
254c255
< DebugOut().write(p, len);
---
> out.write(p, len);
260,262c261,263
< DebugOut().flags(saved_flags);
< DebugOut().fill(old_fill);
< DebugOut().precision(old_precision);
---
> out.flags(saved_flags);
> out.fill(old_fill);
> out.precision(old_precision);