gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging

Browse Source
This commit is contained in:
Gennadiy Civil
2018-04-12 14:00:38 -04:00
parent 3ccd6e3809
commit a79851f2c2
3 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
googlemock/include/gmock/gmock-generated-nice-strict.h
View File

@@ -80,6 +80,11 @@ class NiceMock : public MockClass {
}
#if GTEST_LANG_CXX11
// Ideally, we would inherit base class's constructors through a using
// declaration, which would preserve their visibility. However, many existing
// tests rely on the fact that current implementation reexports protected
// constructors as public. These tests would need to be cleaned up first.
// Single argument constructor is special-cased so that it can be
// made explicit.
template <typename A>
@@ -193,6 +198,11 @@ class NaggyMock : public MockClass {
}
#if GTEST_LANG_CXX11
// Ideally, we would inherit base class's constructors through a using
// declaration, which would preserve their visibility. However, many existing
// tests rely on the fact that current implementation reexports protected
// constructors as public. These tests would need to be cleaned up first.
// Single argument constructor is special-cased so that it can be
// made explicit.
template <typename A>
@@ -306,6 +316,11 @@ class StrictMock : public MockClass {
}
#if GTEST_LANG_CXX11
// Ideally, we would inherit base class's constructors through a using
// declaration, which would preserve their visibility. However, many existing
// tests rely on the fact that current implementation reexports protected
// constructors as public. These tests would need to be cleaned up first.
// Single argument constructor is special-cased so that it can be
// made explicit.
template <typename A>

5
googlemock/include/gmock/gmock-generated-nice-strict.h.pump
View File

@@ -92,6 +92,11 @@ class $clazz : public MockClass {
}
#if GTEST_LANG_CXX11
// Ideally, we would inherit base class's constructors through a using
// declaration, which would preserve their visibility. However, many existing
// tests rely on the fact that current implementation reexports protected
// constructors as public. These tests would need to be cleaned up first.
// Single argument constructor is special-cased so that it can be
// made explicit.
template <typename A>