| Index: base/memory/weak_ptr_unittest.nc
|
| diff --git a/base/memory/weak_ptr_unittest.nc b/base/memory/weak_ptr_unittest.nc
|
| index 9b1226b7941da4117732b211dffe490e9caf9017..8efb59e71b8df510a4e78e7fb24c635e65b029ba 100644
|
| --- a/base/memory/weak_ptr_unittest.nc
|
| +++ b/base/memory/weak_ptr_unittest.nc
|
| @@ -17,7 +17,7 @@ struct MultiplyDerivedProducer : Producer,
|
| struct Unrelated {};
|
| struct DerivedUnrelated : Unrelated {};
|
|
|
| -#if defined(NCTEST_AUTO_DOWNCAST) // [r"fatal error: cannot initialize a member subobject of type 'base::DerivedProducer \*' with an lvalue of type 'base::Producer \*const'"]
|
| +#if defined(NCTEST_AUTO_DOWNCAST) // [r"cannot initialize a variable of type 'base::DerivedProducer \*' with an rvalue of type 'base::Producer \*'"]
|
|
|
| void WontCompile() {
|
| Producer f;
|
| @@ -25,7 +25,7 @@ void WontCompile() {
|
| WeakPtr<DerivedProducer> derived_ptr = ptr;
|
| }
|
|
|
| -#elif defined(NCTEST_STATIC_DOWNCAST) // [r"fatal error: cannot initialize a member subobject of type 'base::DerivedProducer \*' with an lvalue of type 'base::Producer \*const'"]
|
| +#elif defined(NCTEST_STATIC_DOWNCAST) // [r"cannot initialize a variable of type 'base::DerivedProducer \*' with an rvalue of type 'base::Producer \*'"]
|
|
|
| void WontCompile() {
|
| Producer f;
|
| @@ -59,7 +59,7 @@ void WontCompile() {
|
| SupportsWeakPtr<Producer>::StaticAsWeakPtr<DerivedProducer>(&f);
|
| }
|
|
|
| -#elif defined(NCTEST_UNSAFE_HELPER_DOWNCAST) // [r"fatal error: cannot initialize a member subobject of type 'base::DerivedProducer \*' with an lvalue of type 'base::Producer \*'"]
|
| +#elif defined(NCTEST_UNSAFE_HELPER_DOWNCAST) // [r"cannot initialize a variable of type 'base::DerivedProducer \*' with an rvalue of type 'base::Producer \*'"]
|
|
|
| void WontCompile() {
|
| Producer f;
|
| @@ -73,14 +73,14 @@ void WontCompile() {
|
| WeakPtr<DerivedProducer> ptr = AsWeakPtr<DerivedProducer>(&f);
|
| }
|
|
|
| -#elif defined(NCTEST_UNSAFE_WRONG_INSANTIATED_HELPER_DOWNCAST) // [r"fatal error: cannot initialize a member subobject of type 'base::DerivedProducer \*' with an lvalue of type 'base::Producer \*'"]
|
| +#elif defined(NCTEST_UNSAFE_WRONG_INSANTIATED_HELPER_DOWNCAST) // [r"cannot initialize a variable of type 'base::DerivedProducer \*' with an rvalue of type 'base::Producer \*'"]
|
|
|
| void WontCompile() {
|
| - Producer f;
|
| + Producer f;
|
| WeakPtr<DerivedProducer> ptr = AsWeakPtr<Producer>(&f);
|
| }
|
|
|
| -#elif defined(NCTEST_UNSAFE_HELPER_CAST) // [r"fatal error: cannot initialize a member subobject of type 'base::OtherDerivedProducer \*' with an lvalue of type 'base::DerivedProducer \*'"]
|
| +#elif defined(NCTEST_UNSAFE_HELPER_CAST) // [r"cannot initialize a variable of type 'base::OtherDerivedProducer \*' with an rvalue of type 'base::DerivedProducer \*'"]
|
|
|
| void WontCompile() {
|
| DerivedProducer f;
|
| @@ -94,14 +94,14 @@ void WontCompile() {
|
| WeakPtr<OtherDerivedProducer> ptr = AsWeakPtr<OtherDerivedProducer>(&f);
|
| }
|
|
|
| -#elif defined(NCTEST_UNSAFE_WRONG_INSTANTIATED_HELPER_SIDECAST) // [r"fatal error: cannot initialize a member subobject of type 'base::OtherDerivedProducer \*' with an lvalue of type 'base::DerivedProducer \*'"]
|
| +#elif defined(NCTEST_UNSAFE_WRONG_INSTANTIATED_HELPER_SIDECAST) // [r"cannot initialize a variable of type 'base::OtherDerivedProducer \*' with an rvalue of type 'base::DerivedProducer \*'"]
|
|
|
| void WontCompile() {
|
| DerivedProducer f;
|
| WeakPtr<OtherDerivedProducer> ptr = AsWeakPtr<DerivedProducer>(&f);
|
| }
|
|
|
| -#elif defined(NCTEST_UNRELATED_HELPER) // [r"fatal error: cannot initialize a member subobject of type 'base::Unrelated \*' with an lvalue of type 'base::DerivedProducer \*'"]
|
| +#elif defined(NCTEST_UNRELATED_HELPER) // [r"cannot initialize a variable of type 'base::Unrelated \*' with an rvalue of type 'base::DerivedProducer \*'"]
|
|
|
| void WontCompile() {
|
| DerivedProducer f;
|
|
|