aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed link in googlemock documentationPaul Rosset2015-12-086-42/+42
|
* Merge pull request #654 from cmorse/doc_fixBilly Donahue2015-12-0416-159/+162
|\ | | | | Fix lots of broken links in documentation
| * Fix link to FAQ in Primer.mdCaleb Morse2015-12-0316-159/+162
|/
* Merge pull request #647 from mithro/patch-1Billy Donahue2015-12-021-1/+1
|\ | | | | Fix AdvancedGuide link in FAQ.md
| * Fix AdvancedGuide link in FAQ.mdTim Ansell2015-12-021-1/+1
|/
* Merge pull request #636 from ReadmeCritic/masterBilly Donahue2015-11-301-4/+4
|\ | | | | Update README URLs based on HTTP redirects
| * Update README URLs based on HTTP redirectsReadmeCritic2015-11-251-4/+4
| |
* | Merge pull request #607 from google/BillyDonahue-patch-1Billy Donahue2015-11-301-25/+12
|\ \ | | | | | | Update DevGuide.md
| * | Update DevGuide.mdBilly Donahue2015-10-081-25/+12
| | | | | | | | | stop talking about subversion in the devguide.
* | | Merge pull request #640 from Ali-Se/patch-2Billy Donahue2015-11-301-4/+4
|\ \ \ | | | | | | | | Fixing some table error in file
| * | | Fixing some table error in fileAli Sa'ad Eddeen2015-11-291-4/+4
| | |/ | |/| | | | Some tables have missing commas inside the code that make some table cells merge, added missing commas
* | | Merge pull request #638 from KindDragon/patch-1Billy Donahue2015-11-301-50/+50
|\ \ \ | | | | | | | | Update FAQ.md
| * | | Update FAQ.mdArkady Shapkin2015-11-281-50/+50
| |/ /
* | | Merge pull request #592 from Ferenc-/masterBilly Donahue2015-11-301-1/+1
|\ \ \ | |/ / |/| | Fix typo in googlemock/README.md
| * | Fix typo in googlemock/README.mdFerenc-2015-09-191-1/+1
| | |
* | | Merge pull request #633 from plopresti/masterBilly Donahue2015-11-241-6/+1
|\ \ \ | | | | | | | | Fix missing-field-initializers GCC/Clang warning (issue 433).
| * | | Fix missing-field-initializers GCC/Clang warning (issue 433).Patrick J. LoPresti2015-11-241-6/+1
|/ / /
* | | Merge pull request #632 from nocnokneo/add-cmake-install-rulesBilly Donahue2015-11-241-0/+8
|\ \ \ | | | | | | | | Add CMake install rules for gtest libraries and headers
| * | | Add CMake install rules for gtest libraries and headersTaylor Braun-Jones2015-11-231-0/+8
| | | |
* | | | Merge pull request #628 from fjunqueira/patch-1Billy Donahue2015-11-241-0/+16
|\ \ \ \ | | | | | | | | | | Adding CMakeLists.txt to the root dir
| * | | | Create CMakeLists.txtFábio Junqueira2015-11-111-0/+16
| | | | | | | | | | | | | | | Adding functionality to build googletest from the root directory
* | | | | Merge pull request #614 from DukeXar/masterBilly Donahue2015-11-241-9/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Fix C++11 clang builds in Travis CI
| * | | | Override clang++ name on Linux onlyAnton Klautsan2015-10-181-1/+1
| | | | |
| * | | | More docs in travis configAnton Klautsan2015-10-181-0/+4
| | | | |
| * | | | Update clang versionAnton Klautsan2015-10-181-7/+4
| | | | |
| * | | | Adding llvm toolchain repoAnton Klautsan2015-10-181-17/+6
| | | | |
| * | | | Update .travis.ymlAnton Klautsan2015-10-181-4/+8
| | | | |
| * | | | Try to use clang-3.6 in travisAnton Klautsan2015-10-181-4/+1
| | | | |
| * | | | Update .travis.ymlAnton Klautsan2015-10-181-0/+6
| | | | |
| * | | | Update .travis.ymlAnton Klautsan2015-10-181-0/+3
| | |_|/ | |/| |
* | | | Merge pull request #627 from mark-chromium/tests_msvsBilly Donahue2015-11-232-15/+17
|\ \ \ \ | |_|/ / |/| | | Fix warnings encountered in MSVC build of gtest/gmock tests
| * | | Name the helper AsBits()Mark Mentovai2015-11-121-11/+10
| | | |
| * | | 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