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
a2a15f2c
Commit
a2a15f2c
authored
Sep 06, 2018
by
David Schuldenfrei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Compile error, and warning in Visaul Studio 2013
parent
0614a539
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
gmock-matchers.h
googlemock/include/gmock/gmock-matchers.h
+7
-1
gtest-printers.h
googletest/include/gtest/gtest-printers.h
+1
-1
No files found.
googlemock/include/gmock/gmock-matchers.h
View file @
a2a15f2c
...
@@ -56,11 +56,17 @@
...
@@ -56,11 +56,17 @@
# include <initializer_list> // NOLINT -- must be after gtest.h
# include <initializer_list> // NOLINT -- must be after gtest.h
#endif
#endif
#if _MSC_VER >= 1900
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4251
5046
/* class A needs to have dll-interface to be used by clients of
4251
5046
/* class A needs to have dll-interface to be used by clients of
class B */
class B */
/* Symbol involving type with internal linkage not defined */
)
/* Symbol involving type with internal linkage not defined */
)
#else //Pragma 5046 doesn't exist in version of MSC prior to 1900
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4251
/* class A needs to have dll-interface to be used by clients of
class B */
/* Symbol involving type with internal linkage not defined */
)
#endif
namespace
testing
{
namespace
testing
{
// To implement a matcher Foo for type T, define:
// To implement a matcher Foo for type T, define:
...
...
googletest/include/gtest/gtest-printers.h
View file @
a2a15f2c
...
@@ -983,7 +983,7 @@ struct TuplePolicy {
...
@@ -983,7 +983,7 @@ struct TuplePolicy {
template
<
size_t
I
>
template
<
size_t
I
>
static
typename
AddReference
<
const
typename
::
std
::
tr1
::
tuple_element
<
static
typename
AddReference
<
const
typename
::
std
::
tr1
::
tuple_element
<
static_cast
<
int
>
(
I
)
,
Tuple
>::
type
>::
type
I
,
Tuple
>::
type
>::
type
get
(
const
Tuple
&
tuple
)
{
get
(
const
Tuple
&
tuple
)
{
return
::
std
::
tr1
::
get
<
I
>
(
tuple
);
return
::
std
::
tr1
::
get
<
I
>
(
tuple
);
}
}
...
...
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