From bea3d619757e6844a11b4f7c2f85ee05b73abd41 Mon Sep 17 00:00:00 2001
From: 1camper <theonetruecamper@gmx.de>
Date: Wed, 3 Oct 2018 11:05:36 -0400
Subject: [PATCH] Merge d830440d48a9502161448bc78be33a53388dd1f4 into
 f5260ae757a681566d8f7d0558b8dc0551036506

Closes #1830

PiperOrigin-RevId: 215563532
---
 googletest/include/gtest/gtest.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 89214183..ba99737c 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -1815,11 +1815,8 @@ class WithParamInterface {
   virtual ~WithParamInterface() {}
 
   // The current parameter value. Is also available in the test fixture's
-  // constructor. This member function is non-static, even though it only
-  // references static data, to reduce the opportunity for incorrect uses
-  // like writing 'WithParamInterface<bool>::GetParam()' for a test that
-  // uses a fixture whose parameter type is int.
-  const ParamType& GetParam() const {
+  // constructor.
+  static const ParamType& GetParam() {
     GTEST_CHECK_(parameter_ != NULL)
         << "GetParam() can only be called inside a value-parameterized test "
         << "-- did you intend to write TEST_P instead of TEST_F?";