Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.

Bring in gtest 694.
This commit is contained in:
kosak
2014-11-17 00:28:55 +00:00
parent 2336e9c171
commit 5b9cbbb16d
6 changed files with 35 additions and 35 deletions

View File

@@ -268,13 +268,13 @@ class MockFunction<R($ArgTypes)> {
MOCK_METHOD$i[[]]_T(Call, R($ArgTypes));
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_FUNCTION_
std::function<R($ArgTypes)> AsStdFunction() {
return [this]($ArgDecls) {
return this->Call($ArgNames);
};
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_FUNCTION_
private:
GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFunction);