Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Silence a MSVC warning in class Tie

With warning level 4 MSVC complains that a default
assignment operator could not be generated due to
member 'file' is a reference (warning C4512).

Use a pointer instead of a reference and move
struct Tie outisde class Logger while there.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
  • Loading branch information...
commit 6becc8144686b9a40d8dc9d5e0ce4dec28cbcb6a 1 parent 6b5322c
@mcostalba authored
Showing with 18 additions and 18 deletions.
  1. +18 −18 src/misc.cpp
View
36 src/misc.cpp
@@ -94,33 +94,33 @@ void dbg_print() {
/// usual i/o functionality and without changing a single line of code!
/// Idea from http://groups.google.com/group/comp.lang.c++/msg/1d941c0f26ea0d81
-class Logger {
+struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
- Logger() : in(cin.rdbuf(), file), out(cout.rdbuf(), file) {}
- ~Logger() { start(false); }
+ Tie(streambuf* b, ofstream* f) : buf(b), file(f) {}
- struct Tie: public streambuf { // MSVC requires splitted streambuf for cin and cout
+ int sync() { return file->rdbuf()->pubsync(), buf->pubsync(); }
+ int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
+ int underflow() { return buf->sgetc(); }
+ int uflow() { return log(buf->sbumpc(), ">> "); }
- Tie(streambuf* b, ofstream& f) : buf(b), file(f) {}
+ streambuf* buf;
+ ofstream* file;
- int sync() { return file.rdbuf()->pubsync(), buf->pubsync(); }
- int overflow(int c) { return log(buf->sputc((char)c), "<< "); }
- int underflow() { return buf->sgetc(); }
- int uflow() { return log(buf->sbumpc(), ">> "); }
+ int log(int c, const char* prefix) {
- int log(int c, const char* prefix) {
+ static int last = '\n';
- static int last = '\n';
+ if (last == '\n')
+ file->rdbuf()->sputn(prefix, 3);
- if (last == '\n')
- file.rdbuf()->sputn(prefix, 3);
+ return last = file->rdbuf()->sputc((char)c);
+ }
+};
- return last = file.rdbuf()->sputc((char)c);
- }
+class Logger {
- streambuf* buf;
- ofstream& file;
- };
+ Logger() : in(cin.rdbuf(), &file), out(cout.rdbuf(), &file) {}
+ ~Logger() { start(false); }
ofstream file;
Tie in, out;
Please sign in to comment.
Something went wrong with that request. Please try again.