diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-08-11 01:30:13 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 01:30:13 (GMT) |
| commit | c523461f3ae86f766fb8eba6c256f77e257288b0 (patch) | |
| tree | 1894cda37ddd7d6e093a718361d95834d0e4757b /googletest | |
| parent | 4283f264d6ee56888d61d175ee613286395f1f9d (diff) | |
| parent | 75b683df4695c41501b8faca5c00f1ff939f7096 (diff) | |
| download | googletest-c523461f3ae86f766fb8eba6c256f77e257288b0.zip googletest-c523461f3ae86f766fb8eba6c256f77e257288b0.tar.gz googletest-c523461f3ae86f766fb8eba6c256f77e257288b0.tar.bz2 | |
Merge pull request #937 from srz-zumix/fix-gtest-port-typo
Fix or condition typo ( '|' -> '||' )
Diffstat (limited to 'googletest')
| -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 f6cd3c0..c2f9e3c 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -2417,7 +2417,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; |