merging refs/pull/1567/head

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>