aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-2023-40/+203
|\
| * Update CONTRIBUTING.mdGennadiy Civil2018-08-201-4/+5
| |
| * Merge pull request #1759 from gennadiycivil/masterGennadiy Civil2018-08-200-0/+0
| |\ | | | | | | merge
| | * mergeGennadiy Civil2018-08-2014-19/+70
| | |\ | | |/ | |/|
| * | googletest exportmisterg2018-08-2011-9/+63
| | | | | | | | | | | | | | | | | | - 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457654
| * | googletest exportmisterg2018-08-203-0/+18
| | | | | | | | | | | | | | | | | | - 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com> PiperOrigin-RevId: 209457486
| | * Testing, adding a few line to sample4Gennadiy Civil2018-08-2013-532/+21
| | |
| | * Testing, adding to sample4 unittestGennadiy Civil2018-08-2010-0/+532
| |/
| * Merge pull request #1754 from vkotovv/docs-advanced-broken-linksGennadiy Civil2018-08-201-5/+5
| |\ | | | | | | docs: fixed broken references to sections in Advanced guide
| | * docs: fix more broken links to sections in Advanced guideVadim Kotov2018-08-201-3/+3
| | |
| | * docs: fixed broken references to sections in Advanced guideVadim Kotov2018-08-201-2/+2
| | |
| * | Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-201-2/+2
| |\ \ | | |/ | |/| Allow death test child to bypass Windows Error Reporting under MinGW
| | * Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-201-0/+17
| | |\ | | |/ | |/|
| * | Merge pull request #1347 from Burgch/fix-argcGennadiy Civil2018-08-191-0/+17
| |\ \ | | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOS.
| | * \ Merge branch 'master' into fix-argcGennadiy Civil2018-08-193-8/+14
| | |\ \ | | |/ / | |/| |
| | * | Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| | | |
| | * | Merge branch 'master' into fix-argcConor Burgess2018-08-17222-7276/+13402
| | |\ \
| | * \ \ Merge branch 'master' into fix-argcConor Burgess2018-02-1266-388/+1319
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-01-1284-917/+1031
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2017-12-084-1/+8
| | |\ \ \ \ \
| | * | | | | | Fix location of `_NSGetArgv` correction.Conor Burgess2017-12-071-10/+11
| | | | | | | |
| | * | | | | | Fix value pointed to by `_NSGetArgc()` on macOSConor Burgess2017-12-071-0/+16
| | | | | | | |
| | | | | | | * Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-182-4/+10
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-171-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove default /EHsc compiler flag
| | * \ \ \ \ \ \ Merge branch 'master' into fix-msvc-d9025-warningGennadiy Civil2018-08-17203-3123/+3652
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents warning D9025 (one command-line option overrides another) on MSVC builds: some test targets are built with the /EHs-c- which conflicts with /EHsc.
| * | | | | | | | Merge pull request #1652 from medithe/patch-1Gennadiy Civil2018-08-171-4/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Cast the tr1::tuple_element template parameter to int
| | * \ \ \ \ \ \ \ Merge branch 'master' into patch-1Gennadiy Civil2018-08-171-4/+4
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | FormattingGennadiy Civil2018-08-171-4/+5
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-176-15/+93
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15204-3409/+3903
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because in `std::tr1::tuple_element` the first template parameter should be of type int (https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.4/a00547.html), but the code inserts a size_t, the first template parameter should be casted to int before, to get rid of the following errors: googletest-src/googletest/include/gtest/gtest-printers.h:957:60: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {}; and googletest-src/googletest/include/gtest/gtest-printers.h:961:56: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion] const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
| | | | | | | | | | * Merge branch 'fix_death_test_child_mingw_wer_issue1116' of ↵Tanzinul Islam2018-08-180-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
| | | | | | | | | | | * Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-16216-5507/+6416
| | | | | | | | | | | |\
| | | | | | | | | | * | \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-17183-916/+1265
| | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1748 from laixer/stdGennadiy Civil2018-08-171-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | std references shouldn't be fully qualified
| | * | | | | | | | | | | std references shouldn't be fully qualifiedVadim Berezniker2018-08-171-4/+4
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1546 from henryiii/cleanup-cmakeGennadiy Civil2018-08-172-8/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up cache non-advanced variable for subproject
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-08-173-7/+49
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1646 from tisi1988/masterGennadiy Civil2018-08-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX: Compilation warning with GCC regarding a non-initialised member …
| | * | | | | | | | | | | | was not quite right, Gennadiy Civil2018-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fomatting
| | * | | | | | | | | | | | Small formatting changeGennadiy Civil2018-08-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And then we can merge
| | * | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-163-5/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1142 from scottslacksmith/masterGennadiy Civil2018-08-161-2/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | Fix/silence false positive memory leaks reported by Microsoft's debug CRT
| | * | | | | | | | | | | | Small style changes. Gennadiy Civil2018-08-161-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just small style changes and we can accept this PR
| | * | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-16245-8293/+15406
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestScott Slack-Smith2017-11-24167-28439/+3702
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | *Silence false positive memory leaks reported by Microsoft's debug CRT*Scott Slack-Smith2017-06-301-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new RAII MemoryIsNotDeallocated class that excludes memory allocations from Microsoft’s debug CRT leak detection report. We use this RAII class to silence 2 false positive leaks that are caused by memory allocations that are intentionally never deallocated. *Background* The MS debug CRT has a lightweight memory leak detection mechanism that can only detect if a memory allocation is missing a matching deallocation. Consequently, it will report a false positive leak for memory that’s intentionally never deallocated. For example, memory that’s reachable for the entire lifetime of a app. Note the MS debug CRT is always tracking memory allocations but the final memory leak report is disabled by default. As you can’t avoid paying for its cost, you may as well use it. The memory leak report can be enabled by calling the following function #ifdef _MSC_VER _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); #endif // _MSC_VER anywhere before exiting main. For example, the following are the false positive leaks reported before this change; Detected memory leaks! Dumping objects -> {750} normal block at 0x015DF938, 8 bytes long. Data: < ] > 00 F9 5D 01 00 00 00 00 {749} normal block at 0x015DEE60, 32 bytes long. Data: <` ] ` ] ` ] > 60 EE 5D 01 60 EE 5D 01 60 EE 5D 01 01 01 CD CD {748} normal block at 0x015DF900, 12 bytes long. Data: <8 ] ` ] > 38 F9 5D 01 60 EE 5D 01 00 00 00 00 {747} normal block at 0x015DA0F8, 24 bytes long. Data: < > FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 Object dump complete. As you can see from above it’s not easy to identify the above are false positives. Consequently, if false positive leaks are not fixed or silenced, then it becomes impractical to identify real memory leaks.
| | | | * | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-15174-479/+293
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | | Merge branch 'master' into mastertisi19882018-08-1412-78/+71
| | | | |\ \ \ \ \ \ \ \ \ \ \