VS2015/2017 build fix and enable C++11 features #811

KindDragon · 2016-06-27T08:45:55Z

Depend on PR #723

Commit 1695708 allow use C++11 features available in VS2015, fix failed tests with GMock under VC++2015 compiler

BillyDonahue · 2016-06-27T14:19:08Z

googletest/test/gtest_list_tests_unittest.py

@@ -71,7 +71,7 @@
 TypedTest/0\.  # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\.
  TestA
  TestB
-TypedTest/1\.  # TypeParam = int\s*\*
+TypedTest/1\.  # TypeParam = int\s*\*( __ptr64)?


There seems to be a lot going on here that isn't technically necessary.
I would like to have some idea of what's being changed but I can't review all of this at once.
Can you write a little in the "conversation" tab about what exactly is being changed and why?

This commit disappear after you merge PR #723. So ignore this commit here.
Specifically, these changes correct VC++ 64-bit tests

coreykosak · 2016-06-27T15:30:59Z

I'm curious about something. We used to rely on CMake to auto-generate our Visual Studio solution and project files. Are we no longer doing that?

KindDragon · 2016-06-27T15:31:26Z

googletest/include/gtest/internal/gtest-port.h

@@ -355,7 +355,9 @@
 #if GTEST_STDLIB_CXX11
 # define GTEST_HAS_STD_BEGIN_AND_END_ 1
 # define GTEST_HAS_STD_FORWARD_LIST_ 1
-# define GTEST_HAS_STD_FUNCTION_ 1
+# if !defined(_MSC_VER) || (_MSC_FULL_VER >= 190023824) // works only with VS2015U2 and better
+#   define GTEST_HAS_STD_FUNCTION_ 1


VS2015 without updates doesn't support all required std::function features

KindDragon · 2016-06-27T15:41:25Z

@coreykosak I only want support old projects for old VS (2010 and less), because some users depend on them. Old VS projects cannot run tests. New users should use CMake generated projects.

But now we have VS2015 projects #773 😞

coreykosak · 2016-06-27T15:47:50Z

I guess I don't understand the full story. CMake should be able to generate projects for any Visual Studio version, and it can support conditionals to enable or disable tests on some versions.

This is my assumption anyway. I haven't actually tried it.

KindDragon · 2016-06-27T16:15:05Z

Yes you right, but some people prefer don't use CMake and they use old projects.
We can remove old projects at some point.

coreykosak · 2016-06-27T16:31:10Z

I agree. Sorry, I didn't say my whole thought, which is.

Even if we publish the solution and project files for all VS versions (and I think we should), those files should be generated by CMake, not hand-edited. Put another way, our job is to get CMakeLists.txt right, run it for all the versions, and then publish the result.

KindDragon · 2016-06-29T12:56:50Z

@BillyDonahue anything else is not clear in this PR?

KindDragon · 2016-07-08T18:53:23Z

@BillyDonahue any news? I promise that when we will fix VS 2015 build I stop posting messages there 😄

BillyDonahue · 2016-07-10T14:00:52Z

googlemock/include/gmock/gmock-matchers.h

@@ -515,7 +515,7 @@ template <typename T, typename M>
 class MatcherCastImpl {
 public:
  static Matcher<T> Cast(const M& polymorphic_matcher_or_value) {
-    // M can be a polymorhic matcher, in which case we want to use
+    // M can be a polymorphic matcher, in which case we want to use


This is not an MSVC build fix.
Please narrow your changes down for review.

If you want to fix spelling errors, do it separately.

KindDragon · 2016-07-19T07:24:10Z

Rebased to remove changes which were in PR #821

KindDragon · 2016-07-21T08:19:42Z

@BillyDonahue Do I need remove anything else from PR?

eldruin · 2016-08-03T14:37:57Z

googletest/include/gtest/internal/gtest-port.h

+// Determines if unordered_map/unordered_set are available.
+// Only used for testing against those containers.
+#if !defined(GTEST_HAS_UNORDERED_MAP_)
+# if defined(_MSC_VER) && (_MSC_VER >= 1900)


std::unordered_set and std::unordered_map tests should also be enabled on other platforms, I would say this check should be #if GTEST_LANG_CXX11

Somebody can try do that in separate PR. I am trying to merge this changes since 23 February 😄

KindDragon · 2016-08-15T13:24:18Z

@BillyDonahue PR now has only one commit. VS2010 solution changes moved to separate PR.

marco-m · 2016-09-22T19:11:13Z

I agree with @coreykosak: cmake should be used to detect what the compiler supports, instead of adding conditional macro logic in gtest include files.

If somebody is using _old_version of VS and doesn't want to run cmake, why don't they simply use an old version of gtest? :-)

KindDragon · 2016-09-22T20:42:46Z

I don't add it. I just update currently used #ifdef`s

If you know how to do that, patches welcome.

KindDragon · 2016-09-22T20:49:28Z

I agree with @coreykosak: cmake should be used to detect what the compiler supports, instead of adding conditional macro logic in gtest include files.

Why do we have to do it, if condional macro works pretty fine for all use cases?

Patch by KindDragon from google/googletest#811

gennadiycivil · 2017-08-21T15:31:38Z

This looks somewhat messy, a lot of conversation, merge conflicts now.
I am closing it and looking forward to clean PR that can be discussed anew and actually merged in.

KindDragon mentioned this pull request Jun 27, 2016

Run MSVC tests on AppVeyor #723

Merged

BillyDonahue reviewed Jun 27, 2016
View reviewed changes

KindDragon reviewed Jun 27, 2016
View reviewed changes

KindDragon force-pushed the vs-build-fix branch from 9b2fad2 to 320b246 Compare June 29, 2016 08:39

BillyDonahue reviewed Jul 10, 2016
View reviewed changes

KindDragon force-pushed the vs-build-fix branch from 320b246 to a3e9f01 Compare July 11, 2016 10:52

KindDragon force-pushed the vs-build-fix branch from a3e9f01 to af23e9d Compare July 18, 2016 13:48

This was referenced Jul 21, 2016

Mock method with multiple arguments returning std::unique_ptr fails on MSVC14 #799

Closed

Fixed issue #823. Fixed feature detection bugs. #827

Closed

AppVeyor always complains with toolset=140 #823

Closed

eldruin reviewed Aug 3, 2016
View reviewed changes

KindDragon mentioned this pull request Aug 5, 2016

Add x64 configuration #843

Closed

KindDragon force-pushed the vs-build-fix branch 2 times, most recently from 46c636c to 87b1cf0 Compare August 15, 2016 13:11

KindDragon mentioned this pull request Aug 15, 2016

Support x64 configuration for old VS2010 projects #852

Closed

KindDragon force-pushed the vs-build-fix branch 2 times, most recently from ba08175 to 1695708 Compare August 15, 2016 13:56

KindDragon mentioned this pull request Aug 23, 2016

Release 1.8 Changes missing #855

Closed

KindDragon mentioned this pull request Oct 15, 2016

Fixed MSVC warnings #897

Closed

KindDragon mentioned this pull request Jan 3, 2017

fix building on VS 2015 #977

Closed

This was referenced Jan 16, 2017

don't throw exception in destructor in MSVC 2015 #988

Closed

Visual Studio 2015 Build Issues #987

Closed

KindDragon mentioned this pull request Feb 13, 2017

Question re. status of project #1010

Closed

dankegel mentioned this pull request Mar 2, 2017

Build failure on visual studio 2015 #1033

Closed

KindDragon mentioned this pull request Mar 3, 2017

gtest.h generates error on visual studio 2017 #1036

Closed

KindDragon mentioned this pull request Mar 18, 2017

MSVC project work #1046

Closed

KindDragon force-pushed the vs-build-fix branch 4 times, most recently from 6c64f2a to c3685ac Compare May 3, 2017 11:37

KindDragon changed the title ~~VS2015 build fix and enable C++11 features~~ VS2015/2017 build fix and enable C++11 features May 3, 2017

BhaaLseN pushed a commit to BhaaLseN/dolphin that referenced this pull request May 26, 2017

VS2015/2017 build fix and enable C++11 features

597561d

Patch by KindDragon from google/googletest#811

BhaaLseN mentioned this pull request May 26, 2017

Windows: Enable MSVC Standards Conformance (/permissive-) dolphin-emu/dolphin#5484

Merged

BhaaLseN pushed a commit to BhaaLseN/dolphin that referenced this pull request May 28, 2017

VS2015/2017 build fix and enable C++11 features

dda7e2c

Patch by KindDragon from google/googletest#811

spycrab pushed a commit to spycrab/dolphin that referenced this pull request Jun 3, 2017

VS2015/2017 build fix and enable C++11 features

256ddcf

Patch by KindDragon from google/googletest#811

Neui pushed a commit to Neui/dolphin-emu that referenced this pull request Jun 6, 2017

VS2015/2017 build fix and enable C++11 features

138526f

Patch by KindDragon from google/googletest#811

KindDragon added 2 commits June 8, 2017 01:09

Enable C++11 features for VS2015 and VS2017

04acb7d

Fix tests with VS2015 and VS2017

d0f8342

KindDragon force-pushed the vs-build-fix branch from c3685ac to d0f8342 Compare June 7, 2017 22:12

KindDragon mentioned this pull request Jun 7, 2017

googletest uses std::tr1 which will be deprecated in VS 2017 #1111

Closed

Fix gmock tests when std::unary_function unavailable

e8caa4a

NauticalMile64 mentioned this pull request Jul 29, 2017

Unit test - gtest-printers hash_map and hash_set elevated warnings louis-langholtz/PlayRho#24

Closed

gennadiycivil closed this Aug 21, 2017

KindDragon mentioned this pull request Aug 21, 2017

VS2015/2017 build fix and enable C++11 features (attempt number three) #1218

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VS2015/2017 build fix and enable C++11 features #811

VS2015/2017 build fix and enable C++11 features #811

KindDragon commented Jun 27, 2016 •

edited

BillyDonahue Jun 27, 2016

KindDragon Jun 27, 2016

coreykosak commented Jun 27, 2016

KindDragon Jun 27, 2016

KindDragon commented Jun 27, 2016

coreykosak commented Jun 27, 2016

KindDragon commented Jun 27, 2016

coreykosak commented Jun 27, 2016

KindDragon commented Jun 29, 2016

KindDragon commented Jul 8, 2016

BillyDonahue Jul 10, 2016

KindDragon Jul 11, 2016

KindDragon Jul 11, 2016 •

edited

KindDragon commented Jul 19, 2016

KindDragon commented Jul 21, 2016

eldruin Aug 3, 2016

KindDragon Aug 3, 2016

KindDragon commented Aug 15, 2016

marco-m commented Sep 22, 2016

KindDragon commented Sep 22, 2016 •

edited

KindDragon commented Sep 22, 2016

gennadiycivil commented Aug 21, 2017

VS2015/2017 build fix and enable C++11 features #811

VS2015/2017 build fix and enable C++11 features #811

Conversation

KindDragon commented Jun 27, 2016 • edited

BillyDonahue Jun 27, 2016

Choose a reason for hiding this comment

KindDragon Jun 27, 2016

Choose a reason for hiding this comment

coreykosak commented Jun 27, 2016

KindDragon Jun 27, 2016

Choose a reason for hiding this comment

KindDragon commented Jun 27, 2016

coreykosak commented Jun 27, 2016

KindDragon commented Jun 27, 2016

coreykosak commented Jun 27, 2016

KindDragon commented Jun 29, 2016

KindDragon commented Jul 8, 2016

BillyDonahue Jul 10, 2016

Choose a reason for hiding this comment

KindDragon Jul 11, 2016

Choose a reason for hiding this comment

KindDragon Jul 11, 2016 • edited

Choose a reason for hiding this comment

KindDragon commented Jul 19, 2016

KindDragon commented Jul 21, 2016

eldruin Aug 3, 2016

Choose a reason for hiding this comment

KindDragon Aug 3, 2016

Choose a reason for hiding this comment

KindDragon commented Aug 15, 2016

marco-m commented Sep 22, 2016

KindDragon commented Sep 22, 2016 • edited

KindDragon commented Sep 22, 2016

gennadiycivil commented Aug 21, 2017

KindDragon commented Jun 27, 2016 •

edited

KindDragon Jul 11, 2016 •

edited

KindDragon commented Sep 22, 2016 •

edited