Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
fc4aa1d7
Commit
fc4aa1d7
authored
Jan 29, 2014
by
kosak
Browse files
Suppress "Conditional expression is constant" warning on Visual Studio.
parent
b5c81098
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
test/gmock-generated-actions_test.cc
test/gmock-generated-actions_test.cc
+2
-0
test/gmock-internal-utils_test.cc
test/gmock-internal-utils_test.cc
+2
-0
No files found.
test/gmock-generated-actions_test.cc
View file @
fc4aa1d7
...
...
@@ -900,7 +900,9 @@ template <typename T1, typename T2>
// pattern requires the user to use it directly.
ConcatImplActionP3
<
std
::
string
,
T1
,
T2
>
Concat
(
const
std
::
string
&
a
,
T1
b
,
T2
c
)
{
GTEST_INTENTIONAL_CONST_COND_PUSH_
if
(
true
)
{
GTEST_INTENTIONAL_CONST_COND_POP_
// This branch verifies that ConcatImpl() can be invoked without
// explicit template arguments.
return
ConcatImpl
(
a
,
b
,
c
);
...
...
test/gmock-internal-utils_test.cc
View file @
fc4aa1d7
...
...
@@ -250,7 +250,9 @@ TEST(LosslessArithmeticConvertibleTest, FloatingPointToFloatingPoint) {
// Larger size => smaller size is not fine.
EXPECT_FALSE
((
LosslessArithmeticConvertible
<
double
,
float
>::
value
));
GTEST_INTENTIONAL_CONST_COND_PUSH_
if
(
sizeof
(
double
)
==
sizeof
(
long
double
))
{
// NOLINT
GTEST_INTENTIONAL_CONST_COND_POP_
// In some implementations (e.g. MSVC), double and long double
// have the same size.
EXPECT_TRUE
((
LosslessArithmeticConvertible
<
long
double
,
double
>::
value
));
...
...
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