summaryrefslogtreecommitdiffstats
path: root/base/task.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 08:07:02 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 08:07:02 +0000
commitb1fdbd9ca3d573ca68922dc8d5c82bc26fdbfc7a (patch)
tree53c85b16a81266ac2517692338f4695195428602 /base/task.h
parent8c649fbfc809fe8ed32d9872db0a2e2ad866f93b (diff)
downloadchromium_src-b1fdbd9ca3d573ca68922dc8d5c82bc26fdbfc7a.zip
chromium_src-b1fdbd9ca3d573ca68922dc8d5c82bc26fdbfc7a.tar.gz
chromium_src-b1fdbd9ca3d573ca68922dc8d5c82bc26fdbfc7a.tar.bz2
Fix raw_scoped_refptr_mismatch_checker.h.
BUG=28083 TEST=none Review URL: http://codereview.chromium.org/3549010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/task.h')
-rw-r--r--base/task.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/base/task.h b/base/task.h
index b21ccd8..1949e74 100644
--- a/base/task.h
+++ b/base/task.h
@@ -149,8 +149,9 @@ class ScopedRunnableMethodFactory {
: obj_(obj),
meth_(meth),
params_(params) {
- COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value),
- badscopedrunnablemethodparams);
+ COMPILE_ASSERT(
+ (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
+ badscopedrunnablemethodparams);
}
virtual void Run() {
@@ -317,8 +318,9 @@ class RunnableMethod : public CancelableTask {
RunnableMethod(T* obj, Method meth, const Params& params)
: obj_(obj), meth_(meth), params_(params) {
traits_.RetainCallee(obj_);
- COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value),
- badrunnablemethodparams);
+ COMPILE_ASSERT(
+ (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
+ badrunnablemethodparams);
}
~RunnableMethod() {
@@ -429,8 +431,9 @@ class RunnableFunction : public CancelableTask {
public:
RunnableFunction(Function function, const Params& params)
: function_(function), params_(params) {
- COMPILE_ASSERT((FunctionUsesScopedRefptrCorrectly<Function, Params>::value),
- badrunnablefunctionparams);
+ COMPILE_ASSERT(
+ (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value),
+ badrunnablefunctionparams);
}
~RunnableFunction() {