diff options
| author | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
|---|---|---|
| committer | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
| commit | 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (patch) | |
| tree | 148e73f4c3b6354f900cae94be5e9495e04d7efa /test/gmock-generated-function-mockers_test.cc | |
| parent | 9bcb5f9146db42bc38b6bb744fb0cf518a0205be (diff) | |
| download | googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.gz googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.bz2 googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.zip | |
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
Diffstat (limited to 'test/gmock-generated-function-mockers_test.cc')
| -rw-r--r-- | test/gmock-generated-function-mockers_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/gmock-generated-function-mockers_test.cc b/test/gmock-generated-function-mockers_test.cc index 0d90ded7..2087f991 100644 --- a/test/gmock-generated-function-mockers_test.cc +++ b/test/gmock-generated-function-mockers_test.cc @@ -35,11 +35,6 @@ #include "gmock/gmock-generated-function-mockers.h" -#include <map> -#include <string> -#include "gmock/gmock.h" -#include "gtest/gtest.h" - #if GTEST_OS_WINDOWS // MSDN says the header file to be included for STDMETHOD is BaseTyps.h but // we are getting compiler errors if we use basetyps.h, hence including @@ -47,6 +42,11 @@ # include <objbase.h> #endif // GTEST_OS_WINDOWS +#include <map> +#include <string> +#include "gmock/gmock.h" +#include "gtest/gtest.h" + // There is a bug in MSVC (fixed in VS 2008) that prevents creating a // mock for a function with const arguments, so we don't test such // cases for MSVC versions older than 2008. |