diff options
| author | srz_zumix <zumix.cpp@gmail.com> | 2016-11-11 12:21:56 +0900 |
|---|---|---|
| committer | srz_zumix <zumix.cpp@gmail.com> | 2016-11-11 12:21:56 +0900 |
| commit | 75b683df4695c41501b8faca5c00f1ff939f7096 (patch) | |
| tree | 970e685957997dceb4d806f93e6ec53e2b78cac8 | |
| parent | a2b8a8e07628e5fd60644b6dd99c1b5e7d7f1f47 (diff) | |
| download | googletest-75b683df4695c41501b8faca5c00f1ff939f7096.tar.gz googletest-75b683df4695c41501b8faca5c00f1ff939f7096.tar.bz2 googletest-75b683df4695c41501b8faca5c00f1ff939f7096.zip | |
Fix or condition typo ( '|' -> '||' )
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 0d53ad27..ef5ab8a9 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2395,7 +2395,7 @@ inline int Close(int fd) { return close(fd); } inline const char* StrError(int errnum) { return strerror(errnum); } #endif inline const char* GetEnv(const char* name) { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE | GTEST_OS_WINDOWS_RT +#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; |