Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
5cd213ea
Commit
5cd213ea
authored
Apr 11, 2018
by
Gennadiy Civil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..and this should be it
parent
6a7573a7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
1 deletion
+15
-1
gmock-internal-utils.h
googlemock/include/gmock/internal/gmock-internal-utils.h
+15
-1
No files found.
googlemock/include/gmock/internal/gmock-internal-utils.h
View file @
5cd213ea
...
@@ -48,6 +48,14 @@
...
@@ -48,6 +48,14 @@
namespace
testing
{
namespace
testing
{
namespace
internal
{
namespace
internal
{
// Silence MSVC C4100 (unreferenced formal parameter) and
// C4805('==': unsafe mix of type 'const int' and type 'const bool')
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable:4100)
# pragma warning(disable:4805)
#endif
// Joins a vector of strings as if they are fields of a tuple; returns
// Joins a vector of strings as if they are fields of a tuple; returns
// the joined string.
// the joined string.
GTEST_API_
std
::
string
JoinAsTuple
(
const
Strings
&
fields
);
GTEST_API_
std
::
string
JoinAsTuple
(
const
Strings
&
fields
);
...
@@ -510,7 +518,7 @@ struct BooleanConstant {};
...
@@ -510,7 +518,7 @@ struct BooleanConstant {};
// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to
// reduce code size.
// reduce code size.
void
IllegalDoDefault
(
const
char
*
file
,
int
line
);
GTEST_API_
void
IllegalDoDefault
(
const
char
*
file
,
int
line
);
#if GTEST_LANG_CXX11
#if GTEST_LANG_CXX11
// Helper types for Apply() below.
// Helper types for Apply() below.
...
@@ -539,6 +547,12 @@ auto Apply(F&& f, Tuple&& args)
...
@@ -539,6 +547,12 @@ auto Apply(F&& f, Tuple&& args)
make_int_pack
<
std
::
tuple_size
<
Tuple
>::
value
>
());
make_int_pack
<
std
::
tuple_size
<
Tuple
>::
value
>
());
}
}
#endif
#endif
#ifdef _MSC_VER
# pragma warning(pop)
#endif
}
// namespace internal
}
// namespace internal
}
// namespace testing
}
// namespace testing
...
...
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