Gennadiy Civil
f225735222
Code formatting changes, clean up, no functionality changes
2018-08-14 11:08:35 -04:00
Gennadiy Civil
c203bee245
formatting custom/README.md
2018-08-13 22:45:53 -04:00
Gennadiy Civil
9060e19c87
formatting for new READMEs
2018-08-13 16:23:17 -04:00
Gennadiy Civil
63baab8924
Move instructions into custom/README files
2018-08-13 14:31:56 -04:00
Gennadiy Civil
18c940d13a
comment cleanup
2018-08-13 13:17:38 -04:00
Gennadiy Civil
5eb263569b
Update gmock_output_test.py
2018-08-09 15:24:43 -04:00
Gennadiy Civil
063a90b391
Formatting change for auto code management, no functionality changes
...
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 10:51:49 -04:00
Gennadiy Civil
b345bf9090
Formatting changes,small cleanup, no functionality changes
2018-08-07 11:49:47 -04:00
Gennadiy Civil
b78c3b8e00
small cleanup, np functional changes
2018-08-07 10:38:41 -04:00
Gennadiy Civil
24edf4e3bf
automatic code sync mgt, comment only
2018-08-06 15:40:21 -04:00
Gennadiy Civil
16c65a476a
Merge branch 'master' into master
2018-08-01 11:09:34 -04:00
Gennadiy Civil
539ee4bc54
Formatting changes and upstreaming one test
2018-08-01 11:07:22 -04:00
Gennadiy Civil
f978c651ed
Merge branch 'master' into master
2018-07-30 14:01:17 -04:00
Gennadiy Civil
984cba30ed
Formatting changes for automatic code management
2018-07-27 11:15:08 -04:00
Piotr Kąkol
309e8a271e
Updated broken and outdated URLs
2018-07-25 19:19:26 +02:00
Gennadiy Civil
ed1edf641d
Formatting changes, code sync
2018-07-25 10:24:13 -04:00
Masaru Tsuchiyama
534570b5bd
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-21 09:18:54 +09:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
duxiuxing
d8db0ca9cf
Merge branch 'master' into googletest_for_asam
2018-07-20 06:16:21 +08:00
杜修杏
2eb4396007
Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio
2018-07-20 06:15:13 +08:00
Gennadiy Civil
0c17888bcf
code sync
2018-07-19 12:42:39 -04:00
duxiuxing
5b19054b02
Merge branch 'master' into googletest_for_asam
2018-07-19 18:38:20 +08:00
Masaru Tsuchiyama
40cd5d1170
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-19 06:51:13 +09:00
Gennadiy Civil
3530ab9e43
Code sync
2018-07-18 11:51:14 -04:00
Gennadiy Civil
8d07cfd053
Code sync, mostly formatting and removing outdates
2018-07-18 11:30:36 -04:00
Gennadiy Civil
7e73a7ae6e
Formatting and a link
2018-07-18 11:17:19 -04:00
Masaru Tsuchiyama
234958def5
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-18 08:03:49 +09:00
duxiuxing
65a49a73f0
Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss
2018-07-17 15:46:47 +08:00
Adrian Moran
cbd07191f4
Put ifdef guard after the includes.
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Adrian Moran
0acdf79642
Avoid full test in no exceptions are enabled.
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-12 15:10:08 +02:00
Adrian Moran
93bfdde0ee
Fix issue #1654 .
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-11 14:59:01 +02:00
Masaru Tsuchiyama
4bcc9b9807
This closes #1595 : fix compiler error with Visual Studio 2017 on Win10 JP.
...
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.
To fix the errors, remove non-ASCII charactors.
2018-06-30 21:46:41 +09:00
Gennadiy Civil
0b958a03e9
Removed "Documentation.md" not adding value and not consitent with internal docs
2018-06-11 12:07:45 -04:00
Gennadiy Civil
8f87d00398
Rename AdvancedGuide.md to advanced.md and adjust the links.
...
Part of documentation rationalization work
2018-06-11 11:40:35 -04:00
Gennadiy Civil
de47b0d30c
Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation
2018-06-11 11:26:16 -04:00
Gennadiy Civil
8977af0ecf
formatting changes
2018-05-23 11:49:11 -04:00
Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
Scott Graham
a9653c401e
Fix gmock not building when -fno-rtti
...
Fixes issue #1554 . This is internal cl/195020996.
2018-05-02 11:14:39 -07:00
Gennadiy Civil
9af3793103
merged
2018-04-25 13:16:19 -04:00
Gennadiy Civil
b539167cf0
merging,
2018-04-25 13:10:41 -04:00
Gennadiy Civil
884bcdaf18
Merge branch 'master' into parameterless
2018-04-19 18:35:17 -04:00
Gennadiy Civil
bb7a018348
reverting, test
2018-04-19 11:28:46 -04:00
Gennadiy Civil
7b4ee66f5f
reverting just to test
2018-04-19 11:14:17 -04:00
Gennadiy Civil
62a7c140a7
testing
2018-04-19 10:19:59 -04:00
David Sunderland
2d3024f5bd
Fix friend declaration to use GTEST_API_ decl spec.
2018-04-19 01:11:50 -04:00
David Sunderland
b2f97ab317
Revert useless use of GTEST_API_ on WithoutMatchers decl.
2018-04-19 01:10:22 -04:00
David Sunderland
1c79ad7a56
Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC?
2018-04-18 20:59:49 -04:00
David Sunderland
d5725da968
Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors.
2018-04-18 20:25:31 -04:00
David Sunderland
7878b27ddd
Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless
2018-04-18 19:39:39 -04:00
David Sunderland
f6551f2d45
Don't use generalized initializer list; is C++11 extension.
2018-04-18 19:37:33 -04:00