diff options
author | Gennadiy Civil <misterg@google.com> | 2018-04-12 18:00:38 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 18:00:38 (GMT) |
commit | a79851f2c26755324bf0340eed3538d3a047b7a7 (patch) | |
tree | 4fd1471e2a7f6ee81956388c3f8a8aa382411a8f /googlemock/include/gmock/gmock-generated-nice-strict.h | |
parent | 3ccd6e380902da48bd9a11c7f6090b958e0d097f (diff) | |
download | googletest-a79851f2c26755324bf0340eed3538d3a047b7a7.zip googletest-a79851f2c26755324bf0340eed3538d3a047b7a7.tar.gz googletest-a79851f2c26755324bf0340eed3538d3a047b7a7.tar.bz2 |
merging refs/pull/1567/head
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-nice-strict.h')
-rw-r--r-- | googlemock/include/gmock/gmock-generated-nice-strict.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-generated-nice-strict.h b/googlemock/include/gmock/gmock-generated-nice-strict.h index 5e1386b..8e56873 100644 --- a/googlemock/include/gmock/gmock-generated-nice-strict.h +++ b/googlemock/include/gmock/gmock-generated-nice-strict.h @@ -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> |