Changed the default character set to be UNICODE, the same as chromium. Changes to fix compile errors and warnings.
Review URL: http://codereview.appspot.com/816046
git-svn-id: https://angleproject.googlecode.com/svn/trunk@103 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/InfoSink.cpp b/src/compiler/InfoSink.cpp
index 9f2a188..8b70d23 100644
--- a/src/compiler/InfoSink.cpp
+++ b/src/compiler/InfoSink.cpp
@@ -17,11 +17,6 @@
sink.append(s);
}
-#ifdef _WIN32
- if (outputStream & EDebugger)
- OutputDebugString(s);
-#endif
-
if (outputStream & EStdOut)
fprintf(stdout, "%s", s);
}
@@ -33,15 +28,6 @@
sink.append(count, c);
}
-#ifdef _WIN32
- if (outputStream & EDebugger) {
- char str[2];
- str[0] = c;
- str[1] = '\0';
- OutputDebugString(str);
- }
-#endif
-
if (outputStream & EStdOut)
fprintf(stdout, "%c", c);
}
@@ -53,11 +39,6 @@
sink.append(t);
}
-#ifdef _WIN32
- if (outputStream & EDebugger)
- OutputDebugString(t.c_str());
-#endif
-
if (outputStream & EStdOut)
fprintf(stdout, "%s", t.c_str());
}
@@ -69,11 +50,6 @@
sink.append(t.c_str());
}
-#ifdef _WIN32
- if (outputStream & EDebugger)
- OutputDebugString(t.c_str());
-#endif
-
if (outputStream & EStdOut)
fprintf(stdout, "%s", t.c_str());
}
diff --git a/src/compiler/InfoSink.h b/src/compiler/InfoSink.h
index 525a378..a2fb9c3 100644
--- a/src/compiler/InfoSink.h
+++ b/src/compiler/InfoSink.h
@@ -25,9 +25,8 @@
enum TOutputStream {
ENull = 0,
- EDebugger = 0x01,
- EStdOut = 0x02,
- EString = 0x04,
+ EStdOut = 0x01,
+ EString = 0x02,
};
//
// Encapsulate info logs for all objects that have them.
@@ -37,7 +36,7 @@
//
class TInfoSinkBase {
public:
- TInfoSinkBase() : outputStream(4) {}
+ TInfoSinkBase() : outputStream(EString) {}
void erase() { sink.erase(); }
TInfoSinkBase& operator<<(const TPersistString& t) { append(t); return *this; }
TInfoSinkBase& operator<<(char c) { append(1, c); return *this; }