aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Use a templated helper to wrap the castMark Mentovai2015-11-111-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper needs to be templated because its argument type can’t be known. FloatingPointTest is instantiated with RawType = float and RawType = double, so Bits will be an unsigned 32-bit or 64-bit type. size_t will be either 32 or 64 bits depending on the system’s definition, typically based on pointer size.
| * | | | Leave decltype(max_ulps_) alone and cast, not sure this is betterMark Mentovai2015-11-111-12/+14
| | | | |
| * | | | Better use of character constantsMark Mentovai2015-11-111-2/+2
| | | | |
| * | | | Fix warnings encountered in MSVC build of gtest/gmock testsMark Mentovai2015-11-112-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes these warnings: …\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated …\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value …\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value …\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated …\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled …\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data …\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
* | | | Merge pull request #612 from mark-chromium/gmock_rttiBilly Donahue2015-11-101-4/+4
|\ \ \ \ | | | | | | | | | | googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
| * | | | googlemock: Disable WhenDynamicCastToTest tests when RTTI is offMark Mentovai2015-10-121-4/+4
| |/ / / | | | | | | | | | | | | https://github.com/google/googletest/issues/610
* | | | Merge pull request #611 from mark-chromium/gmock_cxx11Billy Donahue2015-11-104-11/+12
|\ \ \ \ | | | | | | | | | | googlemock: Support C++11 language with pre-C++11 library
| * | | | googlemock: Support C++11 language with pre-C++11 libraryMark Mentovai2015-10-124-11/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | This guards use of <type_traits> and its features with GTEST_HAS_STD_TYPE_TRAITS_, and std::function with GTEST_HAS_STD_FUNCTION_.
* | | | Merge pull request #605 from d-meiser/fix-visibility-hiddenBilly Donahue2015-10-293-4/+14
|\ \ \ \ | | | | | | | | | | Fix building of gtest with -fvisibility=hidden [#451]
| * | | | Fix symbol visibility of StreamingListener.Dominic Meiser2015-10-291-1/+1
| | | | |
| * | | | Add an option to enable building with -fvisibility=hidden.Dominic Meiser2015-10-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is set gtest itself is built with -fvisibility=hidden with gcc and clang. This replicates MSVC's default behaviour with gcc and clang.
| * | | | Fix definition of GTEST_API_ macro for gcc and clang [#451].Dominic Meiser2015-10-291-3/+3
|/ / / / | | | | | | | | | | | | This is to enable using gtest with -fvisibility=hidden.
* | | | Merge pull request #616 from anuragsoni/documentation/fix-readme-for-googletestBilly Donahue2015-10-191-2/+2
|\ \ \ \ | |/ / / |/| | | update googletest readme to fix broken links
| * | | update googletest readme to fix broken linksAnurag Soni2015-10-191-2/+2
|/ / /
* | | Merge pull request #604 from marco-m/urls-should-go-to-githubBilly Donahue2015-10-041-22/+22
|\ \ \ | |_|/ |/| | Fix URLs in documentation (point to github, relative links)
| * | Fix relative links in documentationMarco Molteni2015-10-041-8/+8
| | |
| * | Update URLs from googlecode to githubMarco Molteni2015-10-041-16/+16
|/ /
* | Merge pull request #597 from marco-m/patch-1Billy Donahue2015-09-231-1/+1
|\ \ | | | | | | Fix broken link to FrequentlyAskedQuestions
| * | Fix broken link to FrequentlyAskedQuestionsMarco Molteni2015-09-231-1/+1
|/ /
* | Merge pull request #594 from martinmaly/gmockBilly Donahue2015-09-201-2/+6
|\ \ | | | | | | Adding missing files to googlemock distribution.
| * | Adding missing files to googlemock distribution.Martin Maly2015-09-191-2/+6
| |/
* | Merge pull request #593 from martinmaly/distcheckBilly Donahue2015-09-201-1/+5
|\ \ | |/ |/| Adding missing header files to the distribution.
| * Adding missing header files to the distribution.Martin Maly2015-09-191-1/+5
|/
* Merge pull request #591 from google/BillyDonahue-patch-1Billy Donahue2015-09-171-4/+4
|\ | | | | Fix relative links in googlemock docs.
| * Fix relative links in googlemock docs.Billy Donahue2015-09-171-4/+4
|/
* Merge pull request #589 from nomis52/masterBilly Donahue2015-09-173-11/+10
|\ | | | | Fix the googlemock autotools build.
| * Fix the googlemock autotools build.Simon Newton2015-09-173-11/+10
|/
* Merge pull request #585 from orgads/warning-fixBilly Donahue2015-09-091-0/+2
|\ | | | | Fix unused static variable warning on Windows
| * Fix unused static variable warning on WindowsOrgad Shaneh2015-09-091-0/+2
|/
* Include <memory> to use std::unique_ptr.Billy Donahue2015-09-081-0/+1
|
* Googlemock has some tuples containing lvalue refs in its unit tests.Billy Donahue2015-09-072-5/+9
| | | | | | | | | | | | | | | 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 .
* Merge pull request #579 from daus-salar/patch-1Billy Donahue2015-09-071-1/+2
|\ | | | | FIX add missing blank line between text and table
| * FIX add missing blank line between text and tableDaus Salar2015-09-051-1/+2
| | | | | | The markdown interpreter don't interpret the table otherwise.
* | Merge pull request #582 from dmircevski/build-c++11Billy Donahue2015-09-072-0/+2
|\ \ | |/ |/| Add c++11 build to the Travis matrix.
| * Add c++11 build to the Travis matrix.deki2015-09-072-0/+2
|/
* Merge pull request #578 from BillyDonahue/upstream_masterBilly Donahue2015-09-011-2/+2
|\ | | | | build once
| * build onceBilly Donahue2015-09-011-2/+2
| |
* | Merge pull request #577 from BillyDonahue/upstream_masterBilly Donahue2015-09-012-7/+12
|\| | | | | run tests in Travis CI
| * run testsBilly Donahue2015-09-012-27/+13
| |\ | |/ |/|
* | Merge branch 'travis'Billy Donahue2015-09-010-0/+0
|\ \ | | | | | | | | | | | | Conflicts: travis.sh
| * | run tests in Travis CIBilly Donahue2015-09-011-7/+7
| | |
* | | break out test and mock in travisBilly Donahue2015-08-311-1/+1
| | |
* | | break out test and mock in travisBilly Donahue2015-08-312-9/+9
| | |
* | | cleanup travis.shBilly Donahue2015-08-311-25/+7
| | |
* | | remove unused valgrind probeBilly Donahue2015-08-311-1/+0
|/ /
| * reduce the ci matrixBilly Donahue2015-09-011-1/+1
| |
| * restore test runningBilly Donahue2015-09-011-7/+7
|/
* travis updateBilly Donahue2015-08-311-14/+9
|
* Merge branch 'master' of github.com:google/googletest into travisBilly Donahue2015-08-311-0/+2
|\
| * Update README.mdBilly Donahue2015-08-311-0/+2
| |