Merge pull request #2815 from Quuxplusone:simple

PiperOrigin-RevId: 308625388
This commit is contained in:
Gennadiy Rozental
2020-05-01 17:11:43 -04:00
13 changed files with 21 additions and 176 deletions

View File

@@ -574,8 +574,6 @@ class FromType {
private:
bool* const converted_;
GTEST_DISALLOW_ASSIGN_(FromType);
};
class ToType {

View File

@@ -3746,17 +3746,11 @@ struct AStruct {
const double y; // A const field.
Uncopyable z; // An uncopyable field.
const char* p; // A pointer field.
private:
GTEST_DISALLOW_ASSIGN_(AStruct);
};
// A derived struct for testing Field().
struct DerivedStruct : public AStruct {
char ch;
private:
GTEST_DISALLOW_ASSIGN_(DerivedStruct);
};
// Tests that Field(&Foo::field, ...) works when field is non-const.