Gennadiy Civil
dea0216d0c
Merge pull request #2083 from hugolm84/v1.8.x
...
Add missing typedefs for WINCE800 (Windows Embedded Compact 2013)
2019-01-29 23:37:58 -05:00
Gennadiy Civil
aafc594a43
Merge pull request #2086 from hugolm84:fix-dynamic/static-runtime-link
...
PiperOrigin-RevId: 231286700
2019-01-29 15:00:26 +01:00
Gennadiy Civil
4fe76c4d6e
Merge pull request #2085 from LukeCz/patch-2
...
Fix for: failed build on centos6 master #1587
2019-01-28 12:01:12 -05:00
Lukasz Czajczyk
049a0d74b0
Fix for: failed build on centos6 master #1587
...
The issue still exists in 1.8.1 and NOT in master branch. It was introduced to 1.8.1 only by #1512 .
This code
GTEST_COMPILE_ASSERT_(
!IsHashTable<GTEST_REMOVE_REFERENCE_AND_CONST_(LhsContainer)>::value,
use_UnorderedPointwise_with_hash_tables);
Creates 2nd variable use_UnorderedPointwise_with_hash_tables.
2019-01-27 09:06:54 -06:00
Gennadiy Civil
987e7f346a
Update WORKSPACE to make bazel work again
2019-01-25 21:06:10 +01:00
Gennadiy Civil
be8475fdf7
Update WORKSPACE to make bazel work again
2019-01-25 11:54:00 -05:00
Hugo Lindström
aea0d17e85
Merge branch 'fix-compile-on-wec2013' into v1.8.x
2019-01-25 14:23:53 +01:00
Hugo Lindström
d2b89946f8
Add missing typedefs for WINCE800 (Windows Embedded Compact 2013).
2019-01-25 13:59:18 +01:00
Gennadiy Civil
542e057c6c
Merge pull request #1858 from SoapGentoo/v1.8.x
...
Use correct minor version for 1.8 branch
2018-10-04 15:07:24 -04:00
David Seifert
b8c4997b87
Use correct minor version for 1.8 branch
...
Fixes #1816
2018-09-26 08:52:11 +02:00
Gennadiy Civil
30d325023c
Merge branch 'master' into v1.8.x
2018-09-13 10:42:46 -04:00
Gennadiy Civil
792b475b9b
Merge pull request #1817 from DavidSchuldenfrei/1.8.x/bugFix/CompileVS2013
...
Fix Compile error, and warning in Visaul Studio 2013
2018-09-13 10:36:51 -04:00
Gennadiy Civil
cfe0ae8678
Merge pull request #1831 from anthraxx/fix/version
...
version: fix declared version to be in sync with CMakeLists.txt
2018-09-13 10:35:19 -04:00
Gennadiy Civil
2649c22181
Merge pull request #1834 from google/9A681768AABE08D1EFA5CA77528236A4
...
Googletest export
2018-09-13 09:33:13 -04:00
misterg
0cd3c2e8b4
Googletest export
...
Project import generated by Copybara.
PiperOrigin-RevId: 212678005
2018-09-13 09:32:20 -04:00
misterg
21d52d3a1d
Googletest export
...
Project import generated by Copybara.
PiperOrigin-RevId: 212656749
2018-09-13 09:32:12 -04:00
misterg
e1b8d82fa6
Googletest export
...
Internal Change
PiperOrigin-RevId: 212656679
2018-09-13 09:32:01 -04:00
Levente Polyak
c4ef6f3a05
version: fix declared version to be in sync with CMakeLists.txt
2018-09-13 00:50:17 +02:00
Gennadiy Civil
5131cf737c
Merge pull request #1828 from gdsotirov/patch-1
...
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env
2018-09-12 14:45:36 -04:00
Gennadiy Civil
ca247e1797
Merge branch 'master' into patch-1
2018-09-12 14:24:36 -04:00
Gennadiy Civil
d25268a55f
Merge pull request #1829 from google/gennadiycivil-patch-1
...
Update appveyor.yml
2018-09-12 11:42:08 -04:00
Gennadiy Civil
5eee7a343b
Update appveyor.yml
2018-09-12 10:33:31 -04:00
Georgi D. Sotirov
94046c91db
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation error (with -Werror)
...
The unused attribute was removed with commit 3299a23
on 2018-02-23, but it currently breaks build of 1.8.1, because of -Werror GCC parameter as reported in issue #1825 .
2018-09-12 10:44:52 +03:00
David Schuldenfrei
e1d41f3f9f
Gennadiy's comment. Reverts to previous code if not using Visual Studio 2013
2018-09-12 10:43:50 +03:00
Gennadiy Civil
4d066127be
Merge pull request #1827 from google/9A681768AABE08D1EFA5CA77528236A4
...
Googletest export
2018-09-11 14:41:57 -04:00
misterg
db405ff8c3
Googletest export
...
Project import sync
PiperOrigin-RevId: 212450488
2018-09-11 12:59:19 -04:00
misterg
936dae4efe
Googletest export
...
Internal Change
PiperOrigin-RevId: 211798074
2018-09-11 12:59:06 -04:00
Gennadiy Civil
0c799d0436
Merge pull request #1820 from Romain-Geissler/fix-gcc-misleading-indentation-warning-again
...
Fix gcc misleading indentation again.
2018-09-10 21:23:02 -04:00
Romain Geissler
93b05da26c
Fix gcc misleading indentation again.
2018-09-10 01:45:14 +02:00
David Schuldenfrei
a2a15f2cef
Fix Compile error, and warning in Visaul Studio 2013
2018-09-08 21:32:25 +03:00
Gennadiy Civil
34d5d22b64
Merge pull request #1814 from google/9A681768AABE08D1EFA5CA77528236A4
...
Googletest export
2018-09-06 08:48:52 -04:00
misterg
0ddb6bf09b
Googletest export
...
Internal Change
PiperOrigin-RevId: 211699161
2018-09-06 08:47:50 -04:00
Abseil Team
0d2262138c
Googletest export
...
Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception
PiperOrigin-RevId: 211524592
2018-09-06 08:47:43 -04:00
Abseil Team
dbd55366c8
Googletest export
...
Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception
PiperOrigin-RevId: 211519873
2018-09-06 08:47:36 -04:00
misterg
51cabc168f
Googletest export
...
Project import
PiperOrigin-RevId: 211091791
2018-09-06 08:47:23 -04:00
Gennadiy Civil
0614a539f0
Merge pull request #1809 from KindDragon/fix-doc-links
...
Fix doc links
2018-09-05 14:08:31 -04:00
Arkady Shapkin
e6c407d605
Fix doc links
2018-09-04 23:07:18 +03:00
Gennadiy Civil
a2b149b239
Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig
...
pkgconfig: Unconditionally depend on GTest when using GMock
2018-09-04 11:31:18 -04:00
Gennadiy Civil
990bf4ffd1
Merge branch 'master' into fix-gmock-pkgconfig
2018-09-04 10:59:31 -04:00
Gennadiy Civil
3787a483b9
Merge pull request #1803 from KindDragon/patch-2
...
Update documentation to syntax highlight code
2018-09-04 10:56:49 -04:00
Gennadiy Civil
25bf884321
Merge pull request #1806 from asiplas/master
...
Fix #1805 : add `.md` to hyperlink
2018-09-04 10:55:52 -04:00
Andrew Siplas
70a7017582
Fix #1805 : add .md
to hyperlink
2018-09-03 22:13:52 -04:00
Arkady Shapkin
de9675986f
Update documentation to syntax highlight code
2018-09-03 21:56:23 +03:00
David Seifert
79875d320e
pkgconfig: Unconditionally depend on GTest when using GMock
...
* GTest is a required dependency for GMock, hence
we always need to pull it in.
2018-09-02 16:25:18 +02:00
Gennadiy Civil
c7a8998556
Update README.md
2018-08-31 11:56:04 -04:00
Gennadiy Civil
2fe3bd994b
Merge pull request #1433 from dsacre/fix-clang-warnings
...
Fix Clang warnings
2018-08-31 11:21:57 -04:00
Gennadiy Civil
d615eebd9f
Merge branch 'master' into fix-clang-warnings
2018-08-31 10:57:16 -04:00
Gennadiy Civil
4005388b3b
Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4
...
Googletest export
2018-08-31 10:50:06 -04:00
Gennadiy Civil
6dd60ec437
Update googletest-output-test-golden-lin.txt
2018-08-31 10:26:59 -04:00
Dominic Sacré
13c5230bbf
Add user-defined copy constructor to ValueArray
...
Fix Clang warning:
| warning: definition of implicit copy constructor for 'ValueArray2<bool, bool>'
| is deprecated because it has a user-declared copy assignment operator [-Wdeprecated]
2018-08-31 14:57:23 +02:00