Update to current gtest/gmock.

testing/gmock/test/gmock_link_test.h

 // Copyright 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 167 matching lines @@
 using testing::WithoutArgs;
 
 #if !GTEST_OS_WINDOWS_MOBILE
 using testing::SetErrnoAndReturn;
 #endif
 
 #if GTEST_HAS_EXCEPTIONS
 using testing::Throw;
 #endif
 
-#if GMOCK_HAS_REGEX
 using testing::ContainsRegex;
 using testing::MatchesRegex;
-#endif
 
 class Interface {
  public:
   virtual ~Interface() {}
   virtual void VoidFromString(char* str) = 0;
   virtual char* StringFromString(char* str) = 0;
   virtual int IntFromString(char* str) = 0;
   virtual int& IntRefFromString(char* str) = 0;
   virtual void VoidFromFunc(void(*)(char*)) = 0;
   virtual void VoidFromIntRef(int& n) = 0;
@@ skipping 338 matching lines @@
   Mock mock;
   float a = 0;
 
   ON_CALL(mock, VoidFromFloat(FloatEq(a))).WillByDefault(Return());
   ON_CALL(mock, VoidFromDouble(DoubleEq(a))).WillByDefault(Return());
   ON_CALL(mock, VoidFromFloat(NanSensitiveFloatEq(a))).WillByDefault(Return());
   ON_CALL(mock, VoidFromDouble(NanSensitiveDoubleEq(a)))
       .WillByDefault(Return());
 }
 
-#if GMOCK_HAS_REGEX
 // Tests the linkage of the ContainsRegex matcher.
 TEST(LinkTest, TestMatcherContainsRegex) {
   Mock mock;
 
   ON_CALL(mock, VoidFromString(ContainsRegex(".*"))).WillByDefault(Return());
 }
 
 // Tests the linkage of the MatchesRegex matcher.
 TEST(LinkTest, TestMatcherMatchesRegex) {
   Mock mock;
 
   ON_CALL(mock, VoidFromString(MatchesRegex(".*"))).WillByDefault(Return());
 }
-#endif  // GMOCK_HAS_REGEX
 
 // Tests the linkage of the StartsWith, EndsWith, and HasSubstr matchers.
 TEST(LinkTest, TestMatchersSubstrings) {
   Mock mock;
 
   ON_CALL(mock, VoidFromString(StartsWith("a"))).WillByDefault(Return());
   ON_CALL(mock, VoidFromString(EndsWith("c"))).WillByDefault(Return());
   ON_CALL(mock, VoidFromString(HasSubstr("b"))).WillByDefault(Return());
 }
 
@@ skipping 89 matching lines @@
   EXPECT_FALSE(m.Matches(1));
 }
 
 // Tests the linkage of the MatcherCast<T>() function.
 TEST(LinkTest, TestMatcherCast) {
   Matcher<const char*> m = MatcherCast<const char*>(_);
   EXPECT_TRUE(m.Matches(NULL));
 }
 
 #endif  // GMOCK_TEST_GMOCK_LINK_TEST_H_