Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
102b5048
Commit
102b5048
authored
Nov 17, 2014
by
kosak
Browse files
Noop changes to suppress compile-time warnings in WINDOWS code paths.
parent
40be0338
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+1
-0
src/gtest.cc
src/gtest.cc
+1
-1
No files found.
include/gtest/internal/gtest-port.h
View file @
102b5048
...
...
@@ -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
...
...
src/gtest.cc
View file @
102b5048
...
...
@@ -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
=
f
alse
;
const
bool
use_color
=
AlwaysF
alse
()
;
#else
static
const
bool
in_color_mode
=
ShouldUseColor
(
posix
::
IsATTY
(
posix
::
FileNo
(
stdout
))
!=
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment