Code formatting changes, clean up, no functionality changes
diff --git a/googlemock/include/gmock/gmock-generated-actions.h b/googlemock/include/gmock/gmock-generated-actions.h
index 4ce7d35..cd3a102 100644
--- a/googlemock/include/gmock/gmock-generated-actions.h
+++ b/googlemock/include/gmock/gmock-generated-actions.h
@@ -215,8 +215,7 @@
get<2>(args), get<3>(args), get<4>(args), get<5>(args));
}
- // There is no InvokeCallback() for 6-tuples, as google3 callbacks
- // support 5 arguments at most.
+ // There is no InvokeCallback() for 6-tuples
};
template <typename R, typename A1, typename A2, typename A3, typename A4,
@@ -240,8 +239,7 @@
get<6>(args));
}
- // There is no InvokeCallback() for 7-tuples, as google3 callbacks
- // support 5 arguments at most.
+ // There is no InvokeCallback() for 7-tuples
};
template <typename R, typename A1, typename A2, typename A3, typename A4,
@@ -266,8 +264,7 @@
get<6>(args), get<7>(args));
}
- // There is no InvokeCallback() for 8-tuples, as google3 callbacks
- // support 5 arguments at most.
+ // There is no InvokeCallback() for 8-tuples
};
template <typename R, typename A1, typename A2, typename A3, typename A4,
@@ -292,8 +289,7 @@
get<6>(args), get<7>(args), get<8>(args));
}
- // There is no InvokeCallback() for 9-tuples, as google3 callbacks
- // support 5 arguments at most.
+ // There is no InvokeCallback() for 9-tuples
};
template <typename R, typename A1, typename A2, typename A3, typename A4,
@@ -320,8 +316,7 @@
get<6>(args), get<7>(args), get<8>(args), get<9>(args));
}
- // There is no InvokeCallback() for 10-tuples, as google3 callbacks
- // support 5 arguments at most.
+ // There is no InvokeCallback() for 10-tuples
};
// Implements the Invoke(callback) action.
diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump
index 4ec6679..9db68d9 100644
--- a/googlemock/include/gmock/gmock-generated-actions.h.pump
+++ b/googlemock/include/gmock/gmock-generated-actions.h.pump
@@ -88,8 +88,7 @@
return callback->Run($gets);
}
]] $else [[
- // There is no InvokeCallback() for $i-tuples, as google3 callbacks
- // support $max_callback_arity arguments at most.
+ // There is no InvokeCallback() for $i-tuples
]]
};
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 854bc46..4da66c0 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -582,7 +582,6 @@
if (status_ok) {
# if GTEST_USES_PCRE
// PCRE regexes support embedded NULs.
- // GTEST_USES_PCRE is defined only in google3 mode
const bool matched = RE::PartialMatch(error_message, *regex());
# else
const bool matched = RE::PartialMatch(error_message.c_str(), *regex());
diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc
index 4018863..e4bb0c2 100644
--- a/googletest/test/googletest-printers-test.cc
+++ b/googletest/test/googletest-printers-test.cc
@@ -919,8 +919,6 @@
}
#if GTEST_HAS_STD_FORWARD_LIST_
-// <slist> is available on Linux in the google3 mode, but not on
-// Windows or Mac OS X.
TEST(PrintStlContainerTest, SinglyLinkedList) {
int a[] = { 9, 2, 8 };
