diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 02:56:14 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 02:56:14 +0000 |
| commit | f26e19a0a5162a0914b4c0e33429c1e8aa6481af (patch) | |
| tree | cc5af62a7925b5645d1abb42204a7d2e4601534f | |
| parent | f82b4246b8652a14b9f226c5c6d02d8d3a7d9570 (diff) | |
| download | googletest-f26e19a0a5162a0914b4c0e33429c1e8aa6481af.tar.gz | |
Noop changes to suppress compile-time warnings in WINDOWS code paths.
git-svn-id: http://googletest.googlecode.com/svn/trunk@700 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 1 | ||||
| -rw-r--r-- | src/gtest.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 6009247..d8f22c2 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -2317,6 +2317,7 @@ inline const char* StrError(int errnum) { return strerror(errnum); } inline const char* GetEnv(const char* name) { #if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE | GTEST_OS_WINDOWS_RT // We are on Windows CE, which has no environment variables. + static_cast<void>(name); // To prevent 'unused argument' warning. return NULL; #elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9) // Environment variables which we programmatically clear will be set to the diff --git a/src/gtest.cc b/src/gtest.cc index e4f3df3..dc06e02 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -2909,7 +2909,7 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { #if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || \ GTEST_OS_IOS || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - const bool use_color = false; + const bool use_color = AlwaysFalse(); #else static const bool in_color_mode = ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0); |