aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Formatting changes Gennadiy Civil2018-05-2330-30/+30
|
* Merge pull request #1603 from Steelskin/unused-variable-fuchsiaGennadiy Civil2018-05-221-1/+1
|\ | | | | Remove unused variable in Fuchsia.
| * Merge branch 'master' into unused-variable-fuchsiaGennadiy Civil2018-05-225-10/+65
| |\ | |/ |/|
* | Merge pull request #1591 from sgraham/disabled-rttiGennadiy Civil2018-05-222-8/+6
|\ \ | | | | | | Fix gmock not building when -fno-rtti
| * \ Merge branch 'master' into disabled-rttiGennadiy Civil2018-05-223-2/+59
| |\ \ | |/ / |/| |
* | | Merge pull request #1601 from jdennett/StdLibVersioningGennadiy Civil2018-05-223-2/+59
|\ \ \ | | | | | | | | Std lib versioning
| * | | Downgrade to C++98.James Dennett2018-05-211-6/+6
| | | | | | | | | | | | Some projects cannot handle C++11 yet.
| * | | Downgrade to C++98 code.James Dennett2018-05-211-6/+6
| | | | | | | | | | | | Some users are not ready for C++11 yet.
| * | | Merge branch 'master' into StdLibVersioningJames Dennett2018-05-212-4/+30
| |\ \ \ | |/ / / |/| | |
| * | | Add support for versioned standard libraries.James Dennett2018-05-101-2/+18
| | | | | | | | | | | | This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore. This improves compatibility with libc++.
| * | | Update generated code.James Dennett2018-05-101-2/+18
| | | |
| * | | Add unit test for CanonicalizeForStdLibVersioning.James Dennett2018-05-101-0/+25
| | | |
| | * | Merge branch 'master' into disabled-rttiScott Graham2018-05-1110-22/+273
| | |\ \ | |_|/ / |/| | |
| | * | Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| | | | | | | | | | | | | | | | Fixes issue #1554. This is internal cl/195020996.
| | | * Remove unused variable in Fuchsia.Fabrice de Gans-Riberi2018-05-111-1/+1
| |_|/ |/| |
* | | Merge pull request #1597 from jaeheonlee/masterGennadiy Civil2018-05-112-4/+30
|\ \ \ | |/ / |/| | Fix a bug with ad_hoc_test_result() functions of UnitTest and TestCase classes
| * | Use NULL instead of nullptr, for pre-C++11 builds.Jae Heon Lee2018-05-091-2/+2
| | |
| * | Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase ↵Jae Heon Lee2018-05-072-4/+30
|/ / | | | | | | objects would return failures registered at TestCase and UnitTest scopes, respectively.
* | Merge pull request #1593 from Steelskin/fuchsia_death_testGennadiy Civil2018-05-078-18/+243
|\ \ | |/ |/| Add death test support for Fuchsia.
| * Remove magic numberFabrice de Gans-Riberi2018-05-031-1/+1
| |
| * Style fixFabrice de Gans-Riberi2018-05-031-1/+1
| |
| * Fix commentsFabrice de Gans-Riberi2018-05-032-6/+6
| |
| * Fix more stuff and get tests to passFabrice de Gans-Riberi2018-05-036-14/+35
| |
| * Get all the things to work.Fabrice de Gans-Riberi2018-05-021-35/+45
| |
| * Fix stuffFabrice de Gans-Riberi2018-05-011-29/+27
| |
| * Add Fuchsia support for death test.Fabrice de Gans-Riberi2018-05-014-4/+200
|/
* Merge pull request #1589 from sgraham/rtti-buildGennadiy Civil2018-05-012-0/+11
|\ | | | | Add no-exception and no-rtti to build matrix
| * Add no-exception and no-rtti to build matrixScott Graham2018-05-012-0/+11
|/
* Merge pull request #1588 from gennadiycivil/masterGennadiy Civil2018-04-254-597/+619
|\ | | | | mostly 193547722
| * mergedGennadiy Civil2018-04-251-1/+0
| |\ | |/ |/|
* | Merge pull request #1582 from dnsunderland/parameterlessGennadiy Civil2018-04-197-13/+426
|\ \ | | | | | | Introduce parameterless expectations
| * \ Merge branch 'master' into parameterlessGennadiy Civil2018-04-191-112/+93
| |\ \ | |/ / |/| |
| * | Fix friend declaration to use GTEST_API_ decl spec.David Sunderland2018-04-191-1/+1
| | |
| * | Revert useless use of GTEST_API_ on WithoutMatchers decl.David Sunderland2018-04-191-1/+1
| | |
| * | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the ↵David Sunderland2018-04-181-1/+1
| | | | | | | | | | | | problem on MSVC?
| * | Mark new GetWithoutMatchers method as part of the exported API, to address ↵David Sunderland2018-04-182-2/+2
| | | | | | | | | | | | MSVC linker errors.
| * | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest ↵David Sunderland2018-04-185-270/+438
| |\ \ | | | | | | | | | | | | into parameterless
| | * \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | |\ \
| * | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| |/ / /
| * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426
| | | |
| | | * merging, Gennadiy Civil2018-04-258-493/+929
| |_|/ |/| |
* | | Merge pull request #1580 from gennadiycivil/masterGennadiy Civil2018-04-191-112/+93
|\ \ \ | |_|/ |/| | merging
| * | reverting, testGennadiy Civil2018-04-191-13/+3
| | |
| * | reverting just to test Gennadiy Civil2018-04-191-1/+1
| | |
| * | testingGennadiy Civil2018-04-191-12/+12
| | |
| * | more typosGennadiy Civil2018-04-181-1/+1
| | |
| * | msvcGennadiy Civil2018-04-181-8/+6
| | |
| * | more typosGennadiy Civil2018-04-181-3/+2
| | |
| * | typoGennadiy Civil2018-04-181-7/+7
| | |
| * | move only types docsGennadiy Civil2018-04-181-112/+93
| | |