diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-02-12 17:35:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 17:35:07 +0000 |
| commit | f11a8f9131584cf4009eca8af8a66e920c1b7391 (patch) | |
| tree | 06cf7b6488c5980a90bcc355f186047f8b5a16c0 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (diff) | |
| parent | 15392f1a38fa0b8c3f13a9732e94b209069efa1c (diff) | |
| download | googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.gz googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.bz2 googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.zip | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index a8347bd8..c1b63014 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -65,11 +65,6 @@ #include <sstream> #include <string> #include <vector> - -#if GTEST_HAS_EXCEPTIONS -# include <stdexcept> // NOLINT -#endif - #include "gmock/gmock-actions.h" #include "gmock/gmock-cardinalities.h" #include "gmock/gmock-matchers.h" @@ -77,6 +72,10 @@ #include "gmock/internal/gmock-port.h" #include "gtest/gtest.h" +#if GTEST_HAS_EXCEPTIONS +# include <stdexcept> // NOLINT +#endif + namespace testing { // An abstract handle of an expectation. |