diff options
| author | Abseil Team <absl-team@google.com> | 2018-12-17 18:59:00 -0500 |
|---|---|---|
| committer | Mark Barolak <mbar@google.com> | 2018-12-20 14:09:31 -0500 |
| commit | e26a3fa13ca21500773293946e92ec72f8d8c9ea (patch) | |
| tree | c69e48ca1dcbe3623903040d25b4647d70f7d3bf /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 9ab640ce5e5120021c5972d7e60f258bfca64d71 (diff) | |
| download | googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.gz googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.bz2 googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.zip | |
Googletest export
Unifdef c++11-related macros from googletest now that it requires C++11.
PiperOrigin-RevId: 225905601
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 7514635e..133fccef 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -528,7 +528,6 @@ struct BooleanConstant {}; // reduce code size. GTEST_API_ void IllegalDoDefault(const char* file, int line); -#if GTEST_LANG_CXX11 // Helper types for Apply() below. template <size_t... Is> struct int_pack { typedef int_pack type; }; @@ -554,7 +553,6 @@ auto Apply(F&& f, Tuple&& args) return ApplyImpl(std::forward<F>(f), std::forward<Tuple>(args), make_int_pack<std::tuple_size<Tuple>::value>()); } -#endif #ifdef _MSC_VER |