diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-11-13 10:52:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 10:52:25 -0500 |
| commit | 09beafcd1d54fbc14f1b6f38962449cbcb134faa (patch) | |
| tree | 37690c3f09cd287a89bb1b0fb80d4c501860c0a2 /googlemock | |
| parent | 1454f301c554ba40301d898b20cfc0fc5c70770b (diff) | |
| parent | b18d39bd2ea2d2b508228a9a1d8ae9f7fba32f78 (diff) | |
| download | googletest-09beafcd1d54fbc14f1b6f38962449cbcb134faa.tar.gz googletest-09beafcd1d54fbc14f1b6f38962449cbcb134faa.tar.bz2 googletest-09beafcd1d54fbc14f1b6f38962449cbcb134faa.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 95bc22c5..13f27ae6 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -47,6 +47,7 @@ #include <ostream> // NOLINT #include <sstream> #include <string> +#include <type_traits> #include <utility> #include <vector> #include "gmock/internal/gmock-internal-utils.h" |