diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2023-09-29 21:54:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-29 21:54:07 +0000 |
commit | b4567e5fb10159c71fa6d9870267364ea4714f76 (patch) | |
tree | e568063ca5d9e9e557d71e24304156a62534b94a /googlemock/test/gmock-pp-string_test.cc | |
parent | 91ba37be107e1fdefc2bb2ab9a34b36910e0bfd2 (diff) | |
parent | 1fe5590332ce54649bf046171b323905e8cd82b5 (diff) | |
download | googletest-b4567e5fb10159c71fa6d9870267364ea4714f76.tar.gz |
Upgrade googletest to most recent upstream version. am: a00801a508 am: 1fe5590332
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/2765314
Change-Id: I1cb3e865d672e28f4776f228516af437ab80b7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'googlemock/test/gmock-pp-string_test.cc')
-rw-r--r-- | googlemock/test/gmock-pp-string_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/test/gmock-pp-string_test.cc b/googlemock/test/gmock-pp-string_test.cc index 6f66cf15..53c80f4e 100644 --- a/googlemock/test/gmock-pp-string_test.cc +++ b/googlemock/test/gmock-pp-string_test.cc @@ -30,11 +30,10 @@ // Google Mock - a framework for writing C++ mock classes. // // This file tests the internal preprocessor macro library. -#include "gmock/internal/gmock-pp.h" - #include <string> #include "gmock/gmock.h" +#include "gmock/internal/gmock-pp.h" namespace testing { namespace { |