bryanzim
902957028b
Merge branch 'master' into master
2017-12-06 11:09:00 -05:00
Gennadiy Civil
3cbf856bc8
Merge pull request #1225 from brian-peloton/master
...
Speed up printing of characters which need hex escaping
2017-12-05 17:19:23 -05:00
Gennadiy Civil
081432d865
Merge branch 'master' into master
2017-12-01 16:41:53 -05:00
Gennadiy Civil
0c28ac7934
Merge pull request #1324 from whame/master
...
Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-12-01 16:27:33 -05:00
Bryan Zimmerman
f305481536
replaced back accidently removed static_cast with consistent ImplicitCast_
2017-11-22 09:41:32 -05:00
whame
d3d85627fb
Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-11-07 15:22:50 +01:00
bryanzim
c78cb68b2a
Merge branch 'master' into master
2017-10-30 16:58:25 -04:00
Gennadiy Civil
4ebc9034c2
Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312
...
remove markdown stars (bold) from code examples
2017-10-30 11:18:33 -04:00
Gennadiy Civil
60ce69d807
Merge pull request #1308 from KindDragon/vs2017-ci
...
Enable CI for VS2017
2017-10-30 11:11:38 -04:00
Herbert Thielen
beabbc7da6
remove markdown stars (bold) from code examples
2017-10-29 17:12:00 +01:00
Bryan Zimmerman
bb417ab41e
fix for VS2017 deprecation of ::tr1::tuple
...
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
2017-10-27 14:01:16 -04:00
Arkady Shapkin
db52274f30
Enable CI for VS2017
2017-10-26 00:02:11 +03:00
Gennadiy Civil
cb682a5abc
Merge pull request #1304 from m-gupta/gtestapifix
...
googletest: Add GTEST_API_ attribute to ThreadLocal class.
2017-10-25 15:57:21 -04:00
Gennadiy Civil
6b060a7e30
Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning
...
Remove gcc 6 misleading indentations warnings
2017-10-25 13:51:48 -04:00
m-gupta
30d58bcd31
Merge branch 'master' into gtestapifix
2017-10-25 10:24:56 -07:00
Romain Geissler
56088debda
Remove gcc 6 misleading indentations.
2017-10-25 17:53:01 +02:00
Gennadiy Civil
f5ce6a161f
Merge pull request #1218 from KindDragon/vs-build-fix
...
VS2015/2017 build fix and enable C++11 features (attempt number three)
2017-10-25 10:33:54 -04:00
Arkady Shapkin
a938f25467
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
950e2805da
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
85e4858c92
Enable C++11 features for VS2015 and VS2017
2017-10-25 03:24:49 +03:00
Gennadiy Civil
c01a24e10c
Merge pull request #1139 from chehsunliu/master
...
Update the CMakeLists.txt section in googletest README.md.
2017-10-24 11:27:04 -04:00
Manoj Gupta
f4d7a04eb4
googletest: Add GTEST_API_ attribute to ThreadLocal class.
...
ThreadLocal class needs to be have default visibility.
Root cause is gtest uses typeinfo for the ThreadLocal class.
The problem manifests When gtest/gmock are built as a shared library
with libc++. When a class is used in typeinfo, it must have default
visibility.
There is an explanation about typeinfo and visibility here:
https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html
When libc++ is used with gtest in shared library mode, any tests
that are compiled with -fvisibility=hidden and exercise the
macro EXPECT_CALL, it results in an abort like:
[ FATAL ] /usr/include/gtest/internal/gtest-port.h:1394::
Condition typeid(*base) == typeid(Derived) failed.
This is because the typeinfo for ThreadLocal class is not visible.
Therefore, linker failed to match it to the shared library symbol, creating a
new symbol instead.
This fixes https://github.com/google/googletest/issues/1207 .
2017-10-20 14:41:06 -07:00
Gennadiy Civil
302cebfb6a
Merge branch 'master' into master
2017-10-20 17:25:41 -04:00
Gennadiy Civil
c4709fa4ed
Merge pull request #1300 from gennadiycivil/master
...
Workaround for Travis issue https://goo.gl/d5eV8o
2017-10-18 16:24:59 -04:00
Gennadiy Civil
36dbd8cbfb
Merge branch 'master' into master
2017-10-18 16:22:29 -04:00
Gennadiy Civil
b10fafd2f0
Workaround for Travis issue https://goo.gl/d5eV8o
2017-10-18 16:18:47 -04:00
Gennadiy Civil
9d34ec6a54
Merge pull request #1298 from google/revert-1297-master
...
Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is …"
2017-10-18 10:42:49 -04:00
Gennadiy Civil
24c8503b32
Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is …"
2017-10-18 10:42:33 -04:00
Gennadiy Civil
394a6138e2
Merge pull request #1297 from gennadiycivil/master
...
Workaround for Travis issue https://github.com/travis-ci/travis-ci/is …
2017-10-18 10:40:53 -04:00
Gennadiy Civil
8953a6af0d
Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552
2017-10-18 10:40:00 -04:00
Gennadiy Civil
7f37b53b37
Merge pull request #1288 from joealam/master
...
Updated README with C runtime dynamic/static linking issues in Windows info
2017-10-15 19:15:31 -07:00
Gennadiy Civil
1b88b13105
Merge pull request #1292 from DariuszOstolski/master
...
#1282 : Doc typo fix
2017-10-15 19:14:33 -07:00
Dariusz Ostolski
916158a728
#1282 : Doc typo fix
2017-10-14 18:33:19 +02:00
Joe Alam
6d61583e81
Updated README with information about C runtime dynamic/static linking issues in Windows
2017-10-07 23:34:53 +01:00
Gennadiy Civil
56f781b06e
Merge pull request #1275 from jwakely/pr/1273
...
Use gender-neutral pronouns in comments and docs
2017-10-03 10:57:19 -04:00
Jonathan Wakely
c61e22b1fe
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Gennadiy Civil
cd8f5d1729
Merge pull request #1249 from stkhapugin/master
...
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
2017-09-23 16:21:02 -07:00
Gennadiy Civil
e70be7be3d
Merge branch 'master' into master
2017-09-23 16:51:27 -04:00
Gennadiy Civil
cb96b29bb2
Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized
...
Revert "Allow macros inside of parametrized test names."
2017-09-21 10:54:35 -04:00
Gennadiy Civil
2b68b9b9ad
Revert "Allow macros inside of parametrized test names."
2017-09-21 10:54:14 -04:00
Gennadiy Civil
d5417105dc
Merge pull request #1245 from sheepmaster/2017_09_04_parametrized
...
Allow macros inside of parametrized test names.
2017-09-21 10:52:47 -04:00
Gennadiy Civil
bf3f6befd6
Merge pull request #1265 from bkircher/redundant-decl
...
Remove redundant declaration
2017-09-20 14:32:57 -04:00
stkhapugin@chromium.org
01ac9679d1
Swap reinterpret_cast for static_cast
...
Swap reinterpret_cast for static_cast
2017-09-19 12:44:52 +02:00
Benjamin Kircher
136f0e272d
Remove redundant declaration
...
TempDir() function is declared twice, once in `internal/gtest-port.h`
and a second time in `gtest.h`.
Fixes a warning with GCC when -Wredundant-decls is given.
2017-09-16 11:51:36 +02:00
Gennadiy Civil
9c493d0b5f
Merge pull request #1259 from ly2048/patch-1
...
Add explicit `CMAKE_DEBUG_POSTFIX` option
2017-09-14 22:30:24 -04:00
ly2048
2d5fe17429
Merge branch 'master' into patch-1
2017-09-15 10:24:09 +08:00
Gennadiy Civil
03e5ea6635
Merge pull request #1255 from yursha/patch-1
...
Fix ellipsis position in examples
2017-09-14 11:10:51 -04:00
ly2048
9f2866e175
Add explicit CMAKE_DEBUG_POSTFIX
option
...
Enable generating different library name to be compatible with CMake's `FindGTest`.
2017-09-14 13:22:04 +08:00
Alex Yursha
b756c6c48b
Merge branch 'master' into patch-1
2017-09-13 15:59:32 -07:00
Gennadiy Civil
bc66d4ff3a
Merge pull request #1242 from DarthGandalf/expect
...
Make the failure messages from EXPECT_EQ and friends actually symmetric (reopen of #1101 )
2017-09-13 16:33:18 -04:00