diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2023-09-30 03:06:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-30 03:06:27 +0000 |
| commit | 7c3af06b514971cf91ab87accd9cad034a6aee47 (patch) | |
| tree | e568063ca5d9e9e557d71e24304156a62534b94a /googletest/include/gtest/gtest_prod.h | |
| parent | 359bac4851b79f4c202c57a8c4737142914cd38d (diff) | |
| parent | 890e5b7689cd635b2ee9a97b77f4e1aab55adbeb (diff) | |
| download | googletest-7c3af06b514971cf91ab87accd9cad034a6aee47.tar.gz | |
Upgrade googletest to most recent upstream version. am: a00801a508 am: 1fe5590332 am: b4567e5fb1 am: 48eac985ab am: 890e5b7689
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2765314
Change-Id: Iabbe4959ee7de3dc720a2afc81bd819d645bad41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'googletest/include/gtest/gtest_prod.h')
| -rw-r--r-- | googletest/include/gtest/gtest_prod.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googletest/include/gtest/gtest_prod.h b/googletest/include/gtest/gtest_prod.h index 38b9d85a..1f37dc31 100644 --- a/googletest/include/gtest/gtest_prod.h +++ b/googletest/include/gtest/gtest_prod.h @@ -27,9 +27,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Google C++ Testing and Mocking Framework definitions useful in production code. -// GOOGLETEST_CM0003 DO NOT DELETE +// Google C++ Testing and Mocking Framework definitions useful in production +// code. #ifndef GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_ #define GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_ @@ -55,7 +54,7 @@ // Note: The test class must be in the same namespace as the class being tested. // For example, putting MyClassTest in an anonymous namespace will not work. -#define FRIEND_TEST(test_case_name, test_name)\ -friend class test_case_name##_##test_name##_Test +#define FRIEND_TEST(test_case_name, test_name) \ + friend class test_case_name##_##test_name##_Test #endif // GOOGLETEST_INCLUDE_GTEST_GTEST_PROD_H_ |