Remove workarounds for unsupported MSVC versions
This commit is contained in:
		@@ -2484,15 +2484,8 @@ class PropertyMatcher {
 | 
			
		||||
    *listener << whose_property_ << "is ";
 | 
			
		||||
    // Cannot pass the return value (for example, int) to MatchPrintAndExplain,
 | 
			
		||||
    // which takes a non-const reference as argument.
 | 
			
		||||
#if defined(_PREFAST_ ) && _MSC_VER == 1800
 | 
			
		||||
    // Workaround bug in VC++ 2013's /analyze parser.
 | 
			
		||||
    // https://connect.microsoft.com/VisualStudio/feedback/details/1106363/internal-compiler-error-with-analyze-due-to-failure-to-infer-move
 | 
			
		||||
    posix::Abort();  // To make sure it is never run.
 | 
			
		||||
    return false;
 | 
			
		||||
#else
 | 
			
		||||
    RefToConstProperty result = (obj.*property_)();
 | 
			
		||||
    return MatchPrintAndExplain(result, matcher_, listener);
 | 
			
		||||
#endif
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  bool MatchAndExplainImpl(true_type /* is_pointer */, const Class* p,
 | 
			
		||||
 
 | 
			
		||||
@@ -55,10 +55,10 @@
 | 
			
		||||
#include "gtest/internal/gtest-port.h"
 | 
			
		||||
#include "gmock/internal/custom/gmock-port.h"
 | 
			
		||||
 | 
			
		||||
// For MS Visual C++, check the compiler version. At least VS 2003 is
 | 
			
		||||
// For MS Visual C++, check the compiler version. At least VS 2015 is
 | 
			
		||||
// required to compile Google Mock.
 | 
			
		||||
#if defined(_MSC_VER) && _MSC_VER < 1310
 | 
			
		||||
# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock."
 | 
			
		||||
#if defined(_MSC_VER) && _MSC_VER < 1900
 | 
			
		||||
# error "At least Visual C++ 2015 (14.0) is required to compile Google Mock."
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Macro for referencing flags.  This is public as we want the user to
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user