Commit Graph

  • 8977af0ecf formatting changes Gennadiy Civil 2018-05-23 11:49:11 -0400
  • 4e4df226fc
    Merge pull request #1607 from gennadiycivil/master Gennadiy Civil 2018-05-23 08:15:50 -0700
  • 28c91e2cea Formatting changes Gennadiy Civil 2018-05-23 11:03:31 -0400
  • 145d05750b
    Merge pull request #1603 from Steelskin/unused-variable-fuchsia Gennadiy Civil 2018-05-22 06:31:53 -0700
  • 32c84be0fc
    Merge branch 'master' into unused-variable-fuchsia Gennadiy Civil 2018-05-22 06:01:05 -0700
  • 8276dbae6f
    Merge pull request #1591 from sgraham/disabled-rtti Gennadiy Civil 2018-05-22 06:00:40 -0700
  • 3b22e21cc8
    Merge branch 'master' into disabled-rtti Gennadiy Civil 2018-05-22 05:34:05 -0700
  • 1814bed8ec
    Merge pull request #1601 from jdennett/StdLibVersioning Gennadiy Civil 2018-05-22 05:32:53 -0700
  • 49ecebd1f2
    Downgrade to C++98. James Dennett 2018-05-21 12:27:52 -0700
  • ec2c911b33
    Downgrade to C++98 code. James Dennett 2018-05-21 10:59:24 -0700
  • 89286a4cdf
    Merge branch 'master' into StdLibVersioning James Dennett 2018-05-21 10:57:01 -0700
  • 3280099951 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-05-13 11:42:21 +0100
  • f91bf75cf9 Remove unused variable in Fuchsia. Fabrice de Gans-Riberi 2018-05-11 10:38:48 -0700
  • 9db942a6b7
    Merge branch 'master' into disabled-rtti Scott Graham 2018-05-11 09:57:44 -0700
  • 08d5b1f33a
    Merge pull request #1597 from jaeheonlee/master Gennadiy Civil 2018-05-11 09:05:24 -0400
  • 54e331b88b
    Add support for versioned standard libraries. James Dennett 2018-05-10 22:39:19 -0700
  • fc66ae45fc
    Update generated code. James Dennett 2018-05-10 22:36:50 -0700
  • b8fa4d2754
    Add unit test for CanonicalizeForStdLibVersioning. James Dennett 2018-05-10 22:33:29 -0700
  • 18abd8f512 Use NULL instead of nullptr, for pre-C++11 builds. Jae Heon Lee 2018-05-09 13:03:57 -0700
  • ec5ad0f869 Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively. Jae Heon Lee 2018-05-07 14:09:37 -0700
  • 045e7f9ee4
    Merge pull request #1593 from Steelskin/fuchsia_death_test Gennadiy Civil 2018-05-07 14:43:09 -0400
  • 10f05a627c Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-05-05 19:53:33 +0100
  • 960149f913 Remove magic number Fabrice de Gans-Riberi 2018-05-03 13:57:51 -0700
  • 242f0f623c Style fix Fabrice de Gans-Riberi 2018-05-03 13:44:42 -0700
  • 8497540f39 Fix comments Fabrice de Gans-Riberi 2018-05-03 13:42:31 -0700
  • 13af91faff Fix more stuff and get tests to pass Fabrice de Gans-Riberi 2018-05-03 12:06:45 -0700
  • 96c3c422ad Get all the things to work. Fabrice de Gans-Riberi 2018-05-02 14:57:56 -0700
  • a9653c401e Fix gmock not building when -fno-rtti Scott Graham 2018-05-02 11:14:39 -0700
  • b6cb5c3e40 Fix stuff Fabrice de Gans-Riberi 2018-05-01 18:41:03 -0700
  • d4b5281d11 Add Fuchsia support for death test. Fabrice de Gans-Riberi 2018-05-01 16:20:31 -0700
  • 278aba369c
    Merge pull request #1589 from sgraham/rtti-build Gennadiy Civil 2018-05-01 13:07:29 -0400
  • 95ec42d95f Add no-exception and no-rtti to build matrix Scott Graham 2018-04-27 11:27:06 -0700
  • dc043e1ca6
    Merge pull request #1588 from gennadiycivil/master Gennadiy Civil 2018-04-25 13:28:20 -0400
  • 9af3793103 merged Gennadiy Civil 2018-04-25 13:16:19 -0400
  • b539167cf0 merging, Gennadiy Civil 2018-04-25 13:10:41 -0400
  • a6f06bf2fd
    Merge pull request #1582 from dnsunderland/parameterless Gennadiy Civil 2018-04-19 18:44:01 -0400
  • 884bcdaf18
    Merge branch 'master' into parameterless Gennadiy Civil 2018-04-19 18:35:17 -0400
  • 1114a0202a
    Merge pull request #1580 from gennadiycivil/master Gennadiy Civil 2018-04-19 11:57:52 -0400
  • bb7a018348 reverting, test Gennadiy Civil 2018-04-19 11:28:46 -0400
  • 7b4ee66f5f reverting just to test Gennadiy Civil 2018-04-19 11:14:17 -0400
  • 62a7c140a7 testing Gennadiy Civil 2018-04-19 10:19:59 -0400
  • 2d3024f5bd Fix friend declaration to use GTEST_API_ decl spec. David Sunderland 2018-04-19 01:11:50 -0400
  • b2f97ab317 Revert useless use of GTEST_API_ on WithoutMatchers decl. David Sunderland 2018-04-19 01:10:22 -0400
  • 1c79ad7a56 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? David Sunderland 2018-04-18 20:59:49 -0400
  • d5725da968 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. David Sunderland 2018-04-18 20:25:31 -0400
  • 7878b27ddd Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless David Sunderland 2018-04-18 19:39:39 -0400
  • f6551f2d45 Don't use generalized initializer list; is C++11 extension. David Sunderland 2018-04-18 19:37:33 -0400
  • 08cb06b197
    Merge branch 'master' into parameterless dnsunderland 2018-04-18 16:32:31 -0700
  • f437f8ca0d Clone of unsubmitted cr/176529515. Introduce parameterless expectations. David Sunderland 2018-04-18 19:28:56 -0400
  • f312435032 more typos Gennadiy Civil 2018-04-18 17:13:23 -0400
  • a0fd742639 msvc Gennadiy Civil 2018-04-18 17:03:42 -0400
  • b00e281078 more typos Gennadiy Civil 2018-04-18 16:43:11 -0400
  • 881ee307a7 typo Gennadiy Civil 2018-04-18 15:18:03 -0400
  • 10e8ec2714 move only types docs Gennadiy Civil 2018-04-18 15:10:07 -0400
  • 4d554c391b typo Gennadiy Civil 2018-04-18 15:02:47 -0400
  • b4cbf531e9 typo Gennadiy Civil 2018-04-18 14:25:58 -0400
  • 78d73814fa http://cl/193386206 Gennadiy Civil 2018-04-18 14:21:28 -0400
  • a48b95ef81 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-18 11:05:12 -0400
  • c56ba73a23 merge, explicit, ( should be it) Gennadiy Civil 2018-04-18 11:05:00 -0400
  • 4bd8c4638a
    Merge pull request #1579 from gennadiycivil/master Gennadiy Civil 2018-04-18 10:57:04 -0400
  • 88311784e4 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-18 10:36:24 -0400
  • 4707c0ffd4 193353312 Gennadiy Civil 2018-04-18 10:36:12 -0400
  • 4035d6ecc0
    Merge pull request #1577 from gennadiycivil/master Gennadiy Civil 2018-04-17 19:44:13 -0400
  • 80d6e26a9c cl/193060888 Gennadiy Civil 2018-04-17 19:32:15 -0400
  • 5dccf6b79e http://cl/193060888 Gennadiy Civil 2018-04-17 16:22:35 -0400
  • dff32aff97 http://cl/193060888 Gennadiy Civil 2018-04-17 16:12:04 -0400
  • 3f88bb1831 test-meerging Gennadiy Civil 2018-04-16 15:52:47 -0400
  • ec425d7160 typo Gennadiy Civil 2018-04-16 12:00:37 -0400
  • e4ab316c85 more msvc Gennadiy Civil 2018-04-16 11:52:22 -0400
  • 1944bc0f51 typo Gennadiy Civil 2018-04-16 11:41:36 -0400
  • e9eff488f9 msvc warnings Gennadiy Civil 2018-04-16 11:32:16 -0400
  • bd2a1aed03 merging gmock generated matchers Gennadiy Civil 2018-04-16 11:18:49 -0400
  • 1f605414cc
    Merge pull request #1576 from gennadiycivil/master Gennadiy Civil 2018-04-16 11:02:12 -0400
  • 9fba103156 merging, testing, this should be it Gennadiy Civil 2018-04-16 10:42:08 -0400
  • 1c6e68cf6c merging Gennadiy Civil 2018-04-16 10:34:07 -0400
  • 26c10dc7e6 merging Gennadiy Civil 2018-04-16 10:16:48 -0400
  • 247ded3236
    Merge pull request #1571 from gennadiycivil/master Gennadiy Civil 2018-04-14 19:24:19 -0400
  • d84eb86df5 more pizza Gennadiy Civil 2018-04-13 16:04:34 -0400
  • f45728a5ac more OSX pizzas Gennadiy Civil 2018-04-13 15:48:57 -0400
  • b74a1af00f osx pizzas Gennadiy Civil 2018-04-13 11:49:37 -0400
  • f9bd6180de merging gmock actions test Gennadiy Civil 2018-04-13 11:02:55 -0400
  • 0bfa823785 merging, gmock actions test Gennadiy Civil 2018-04-13 11:02:25 -0400
  • 38de61d73b
    Merge pull request #1569 from gennadiycivil/master Gennadiy Civil 2018-04-13 09:41:33 -0400
  • 6d31084797 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-13 09:16:56 -0400
  • 2dc576ec55 merging Gennadiy Civil 2018-04-13 09:16:40 -0400
  • 0957cce368
    Merge pull request #1568 from gennadiycivil/master Gennadiy Civil 2018-04-12 18:56:57 -0400
  • f7330f9f14 more fixing osx libstd++ bugs Gennadiy Civil 2018-04-12 17:00:31 -0400
  • 65380492b2 fixing Gennadiy Civil 2018-04-12 16:32:03 -0400
  • dc4f5638c2 merging, fix OSX issue Gennadiy Civil 2018-04-12 15:45:21 -0400
  • 092ca91072 merging Gennadiy Civil 2018-04-12 14:46:57 -0400
  • 6fb65b8215
    Merge pull request #1567 from gennadiycivil/master Gennadiy Civil 2018-04-12 14:41:48 -0400
  • a79851f2c2 merging Gennadiy Civil 2018-04-12 14:00:38 -0400
  • 3ccd6e3809
    Merge pull request #1566 from gennadiycivil/master Gennadiy Civil 2018-04-12 13:55:37 -0400
  • fa658e0cc0 merging Gennadiy Civil 2018-04-12 13:42:47 -0400
  • 531e29485c
    Merge pull request #1562 from gennadiycivil/master Gennadiy Civil 2018-04-12 11:45:40 -0400
  • c67f51b5dc msvc Gennadiy Civil 2018-04-12 11:32:17 -0400
  • 9b5940e040 revert this one Gennadiy Civil 2018-04-12 10:28:02 -0400
  • b2d81b4fb2 merge, ... gmock-matchers test Gennadiy Civil 2018-04-12 09:45:07 -0400
  • 07f3bdd4c9 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-12 09:13:38 -0400
  • b640d8743d
    Merge pull request #1557 from pwnall/gmock-fix-ub Gennadiy Civil 2018-04-12 09:13:11 -0400