gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Fixes build warnings from previous CL
Add CMake to internal presubmit to prevent these

PiperOrigin-RevId: 337325504
This commit is contained in:
dmauro
2020-10-15 12:38:46 -04:00
committed by Derek Mauro
parent ebbeee39f5
commit 3c95bf5524
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/include/gmock/gmock-matchers.h
View File

@@ -2980,7 +2980,7 @@ auto UnpackStruct(const T& t)
// The array ensures left-to-right order of evaluation. // The array ensures left-to-right order of evaluation.
// Usage: VariadicExpand({expr...}); // Usage: VariadicExpand({expr...});
template <typename T, size_t N> template <typename T, size_t N>
void VariadicExpand(const T (&a)[N]) {} void VariadicExpand(const T (&)[N]) {}
template <typename Struct, typename StructSize> template <typename Struct, typename StructSize>
class FieldsAreMatcherImpl; class FieldsAreMatcherImpl;
@@ -3029,12 +3029,12 @@ class FieldsAreMatcherImpl<Struct, IndexSequence<I...>>
return good; return good;
} }
int failed_pos = -1; size_t failed_pos = ~size_t{};
std::vector<StringMatchResultListener> inner_listener(sizeof...(I)); std::vector<StringMatchResultListener> inner_listener(sizeof...(I));
VariadicExpand( VariadicExpand(
{failed_pos == -1 && !std::get<I>(matchers_).MatchAndExplain( {failed_pos == ~size_t{} && !std::get<I>(matchers_).MatchAndExplain(
std::get<I>(tuple), &inner_listener[I]) std::get<I>(tuple), &inner_listener[I])
? failed_pos = I ? failed_pos = I
: 0 ...}); : 0 ...});

2
googletest/include/gtest/internal/gtest-internal.h
View File

@@ -287,7 +287,7 @@ class FloatingPoint {
// //
// See the following article for more details on ULP: // See the following article for more details on ULP:
// http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
static const size_t kMaxUlps = 4; static const uint32_t kMaxUlps = 4;
// Constructs a FloatingPoint from a raw floating-point number. // Constructs a FloatingPoint from a raw floating-point number.
// //

2
googletest/test/gtest_unittest.cc
View File

@@ -2768,7 +2768,7 @@ class FloatingPointTest : public Test {
typedef typename Floating::Bits Bits; typedef typename Floating::Bits Bits;
void SetUp() override { void SetUp() override {
const size_t max_ulps = Floating::kMaxUlps; const uint32_t max_ulps = Floating::kMaxUlps;
// The bits that represent 0.0. // The bits that represent 0.0.
const Bits zero_bits = Floating(0).bits(); const Bits zero_bits = Floating(0).bits();