Skip to content

G
googletest
Commit c523461f by Gennadiy Civil Committed by GitHub
Options

Merge pull request #937 from srz-zumix/fix-gtest-port-typo

Fix or condition typo ( '|' -> '||' )
parents 4283f264 75b683df
Showing with 1 addition and 1 deletion
googletest/include/gtest/internal/gtest-port.h
...@@ -2417,7 +2417,7 @@ inline int Close(int fd) { return close(fd); } ...@@ -2417,7 +2417,7 @@ inline int Close(int fd) { return close(fd); }
inline const char* StrError(int errnum) { return strerror(errnum); } inline const char* StrError(int errnum) { return strerror(errnum); }
#endif #endif
inline const char* GetEnv(const char* name) { 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. // We are on Windows CE, which has no environment variables.
static_cast<void>(name); // To prevent 'unused argument' warning. static_cast<void>(name); // To prevent 'unused argument' warning.
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment