Skip to content

Commit ea57daf

Browse files
authored
Merge branch 'nodejs:main' into diag/suppression-als
2 parents 24a87f4 + 5498337 commit ea57daf

285 files changed

Lines changed: 16814 additions & 14467 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

deps/googletest/include/gtest/gtest-message.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class GTEST_API_ Message {
129129
int>::type = 0
130130
#endif // GTEST_HAS_ABSL
131131
>
132-
inline Message& operator<<(const T& val) {
132+
Message& operator<<(const T& val) {
133133
// Some libraries overload << for STL containers. These
134134
// overloads are defined in the global namespace instead of ::std.
135135
//
@@ -155,7 +155,7 @@ class GTEST_API_ Message {
155155
template <typename T,
156156
typename std::enable_if<absl::HasAbslStringify<T>::value, // NOLINT
157157
int>::type = 0>
158-
inline Message& operator<<(const T& val) {
158+
Message& operator<<(const T& val) {
159159
// ::operator<< is needed here for a similar reason as with the non-Abseil
160160
// version above
161161
using ::operator<<;

0 commit comments

Comments
 (0)