4 Commits

Author	SHA1	Message	Date
Hector Dearman	41ad243d93	Fix typo in gmock-actions.h ... This upstreams a Google-internal change (141765019).	2017-06-19 18:43:55 +01:00
Nico Weber	09fd5b3ebf	Use std::string and ::string explicitly in gtest and gmock code. ... This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.	2017-05-15 17:53:04 -04:00
Mark Mentovai	a0435dc687	googlemock: Support C++11 language with pre-C++11 library ... This guards use of <type_traits> and its features with GTEST_HAS_STD_TYPE_TRAITS_, and std::function with GTEST_HAS_STD_FUNCTION_.	2015-10-12 17:59:11 -04:00
Billy Donahue	affb09edf0	move googlemock files into googlemock/ subdir	2015-08-25 17:47:18 -04:00