summaryrefslogtreecommitdiffstats
path: root/base/callback_unittest.nc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-11-03 13:29:30 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-03 21:29:44 +0000
commitb760d7244b7a154d7fb4239707749f79ac0c5959 (patch)
treeef05404453e0d17cf3a32f27050e236175aad52a /base/callback_unittest.nc
parent531a117bc26a709a89dd1316ebacaf8bb5467e07 (diff)
downloadchromium_src-b760d7244b7a154d7fb4239707749f79ac0c5959.zip
chromium_src-b760d7244b7a154d7fb4239707749f79ac0c5959.tar.gz
chromium_src-b760d7244b7a154d7fb4239707749f79ac0c5959.tar.bz2
Switch to clang for nocompile tests and rebaseline existing results.
BUG=105388 Review URL: https://codereview.chromium.org/678263003 Cr-Commit-Position: refs/heads/master@{#302483}
Diffstat (limited to 'base/callback_unittest.nc')
-rw-r--r--base/callback_unittest.nc6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/callback_unittest.nc b/base/callback_unittest.nc
index 9bddd1f..e7607d9 100644
--- a/base/callback_unittest.nc
+++ b/base/callback_unittest.nc
@@ -12,7 +12,7 @@ class Parent {
class Child : Parent {
};
-#if defined(NCTEST_EQUALS_REQUIRES_SAMETYPE) // [r"no matching function for call to 'base::Callback<void\(\)>::Equals\(base::Callback<int\(\)>&\)'"]
+#if defined(NCTEST_EQUALS_REQUIRES_SAMETYPE) // [r"fatal error: no viable conversion from 'Callback<int \(\)>' to 'const Callback<void \(\)>'"]
// Attempting to call comparison function on two callbacks of different type.
//
@@ -24,7 +24,7 @@ void WontCompile() {
c1.Equals(c2);
}
-#elif defined(NCTEST_CONSTRUCTION_FROM_SUBTYPE) // [r"conversion from 'base::Callback<base::Parent\(\)>' to non-scalar type 'base::Callback<base::Child\(\)>'"]
+#elif defined(NCTEST_CONSTRUCTION_FROM_SUBTYPE) // [r"fatal error: no viable conversion from 'Callback<base::Parent \(\)>' to 'Callback<base::Child \(\)>'"]
// Construction of Callback<A> from Callback<B> if A is supertype of B.
//
@@ -35,7 +35,7 @@ void WontCompile() {
Callback<Child(void)> cb_b = cb_a;
}
-#elif defined(NCTEST_ASSIGNMENT_FROM_SUBTYPE) // [r"no match for 'operator=' in 'cb_a = cb_b'"]
+#elif defined(NCTEST_ASSIGNMENT_FROM_SUBTYPE) // [r"fatal error: no viable overloaded '='"]
// Assignment of Callback<A> from Callback<B> if A is supertype of B.
// See explanation for NCTEST_CONSTRUCTION_FROM_SUBTYPE