diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-22 20:06:20 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-22 20:06:20 +0000 |
| commit | 709ea28f3264aa5632e5577a4080671173fc6166 (patch) | |
| tree | ebb91c2bdf45990cec0829ecf137eef69e130666 /src/google/protobuf/testing | |
| parent | 6f9bc71ffdf84d7cb0288112970659a94a2f13ae (diff) | |
| download | protobuf-709ea28f3264aa5632e5577a4080671173fc6166.tar.gz protobuf-709ea28f3264aa5632e5577a4080671173fc6166.tar.bz2 protobuf-709ea28f3264aa5632e5577a4080671173fc6166.zip | |
Work around windows.h #defining GetMessage().
Diffstat (limited to 'src/google/protobuf/testing')
| -rw-r--r-- | src/google/protobuf/testing/googletest.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h index 0cb139cd..71444c96 100644 --- a/src/google/protobuf/testing/googletest.h +++ b/src/google/protobuf/testing/googletest.h @@ -58,6 +58,7 @@ string GetCapturedTestStderr(); // For use with ScopedMemoryLog::GetMessages(). Inside Google the LogLevel // constants don't have the LOGLEVEL_ prefix, so the code that used // ScopedMemoryLog refers to LOGLEVEL_ERROR as just ERROR. +#undef ERROR // defend against promiscuous windows.h static const LogLevel ERROR = LOGLEVEL_ERROR; // Receives copies of all LOG(ERROR) messages while in scope. Sample usage: |