5 Commits

Author	SHA1	Message	Date
Gennadiy Civil	278da818bb	merging, fix OSX issue	2018-04-12 15:45:21 -04:00
Gennadiy Civil	2cb8105063	merging	2018-04-12 14:46:57 -04:00
Nico Weber	3ec8d72fc1	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
Billy Donahue	f19b060075	Googlemock has some tuples containing lvalue refs in its unit tests. ... These tuples are created with make_tuple, which is given temporaries. The make_tuple is in a function argument list. A possibly overzealous static_assert in libc++'s std::tuple ctor is firing in our 'Perform(make_tuple("hi"))' calls, so we can't use its make_tuple here. Instead we will use explicitly-constructed tuples constructed from non-temporary strings. Workaround for llvm bug: https://llvm.org/bugs/show_bug.cgi?id=20855 An alternative to https://github.com/google/googletest/pull/580 .	2015-09-07 22:32:56 -04:00
Billy Donahue	affb09edf0	move googlemock files into googlemock/ subdir	2015-08-25 17:47:18 -04:00