diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 09:31:33 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 09:31:33 +0000 |
| commit | f258ba2e2403ada7c5c72fb9950637ddea86a014 (patch) | |
| tree | fe4f332f054a99bc10b9d781f0723adabd0055d8 /base/task.h | |
| parent | 968ca7b38235bdcae6ec82173e1fe01bcf248eb1 (diff) | |
| download | chromium_src-f258ba2e2403ada7c5c72fb9950637ddea86a014.zip chromium_src-f258ba2e2403ada7c5c72fb9950637ddea86a014.tar.gz chromium_src-f258ba2e2403ada7c5c72fb9950637ddea86a014.tar.bz2 | |
Revert 69243 - Reland 69237 - Fix raw_scoped_refptr_mismatch_checker.h.
Damn, missed a unittest.
BUG=28083
TEST=none
Review URL: http://codereview.chromium.org/3549010
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/5885001
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/5887001
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/5888001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/task.h')
| -rw-r--r-- | base/task.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/base/task.h b/base/task.h index 1949e74..b21ccd8 100644 --- a/base/task.h +++ b/base/task.h @@ -149,9 +149,8 @@ class ScopedRunnableMethodFactory { : obj_(obj), meth_(meth), params_(params) { - COMPILE_ASSERT( - (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), - badscopedrunnablemethodparams); + COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value), + badscopedrunnablemethodparams); } virtual void Run() { @@ -318,9 +317,8 @@ class RunnableMethod : public CancelableTask { RunnableMethod(T* obj, Method meth, const Params& params) : obj_(obj), meth_(meth), params_(params) { traits_.RetainCallee(obj_); - COMPILE_ASSERT( - (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), - badrunnablemethodparams); + COMPILE_ASSERT((MethodUsesScopedRefptrCorrectly<Method, Params>::value), + badrunnablemethodparams); } ~RunnableMethod() { @@ -431,9 +429,8 @@ class RunnableFunction : public CancelableTask { public: RunnableFunction(Function function, const Params& params) : function_(function), params_(params) { - COMPILE_ASSERT( - (base::internal::ParamsUseScopedRefptrCorrectly<Params>::value), - badrunnablefunctionparams); + COMPILE_ASSERT((FunctionUsesScopedRefptrCorrectly<Function, Params>::value), + badrunnablefunctionparams); } ~RunnableFunction() { |