Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2359)

Unified Diff: base/bind_internal.h

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/bind_internal.h
diff --git a/base/bind_internal.h b/base/bind_internal.h
index 1d8efec513eba10eb54261335ae0116229f72a1f..b568c162f5864114997d31afaa778def135157fd 100644
--- a/base/bind_internal.h
+++ b/base/bind_internal.h
@@ -1850,9 +1850,11 @@ struct BindState<Runnable, RunType, void()> : public BindStateBase {
: runnable_(runnable) {
}
- virtual ~BindState() { }
-
RunnableType runnable_;
+
+ private:
+ ~BindState() override { }
+
};
template <typename Runnable, typename RunType, typename P1>
@@ -1871,11 +1873,13 @@ struct BindState<Runnable, RunType, void(P1)> : public BindStateBase {
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2>
@@ -1896,12 +1900,14 @@ struct BindState<Runnable, RunType, void(P1, P2)> : public BindStateBase {
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2,
@@ -1925,13 +1931,15 @@ struct BindState<Runnable, RunType, void(P1, P2, P3)> : public BindStateBase {
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
P3 p3_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2,
@@ -1959,14 +1967,16 @@ struct BindState<Runnable, RunType, void(P1, P2, P3,
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
P3 p3_;
P4 p4_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2,
@@ -1996,15 +2006,17 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4,
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
P3 p3_;
P4 p4_;
P5 p5_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2,
@@ -2036,9 +2048,6 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5,
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
@@ -2046,6 +2055,11 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5,
P4 p4_;
P5 p5_;
P6 p6_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
template <typename Runnable, typename RunType, typename P1, typename P2,
@@ -2079,9 +2093,6 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6,
MaybeRefcount<HasIsMethodTag<Runnable>::value, P1>::AddRef(p1_);
}
- virtual ~BindState() { MaybeRefcount<HasIsMethodTag<Runnable>::value,
- P1>::Release(p1_); }
-
RunnableType runnable_;
P1 p1_;
P2 p2_;
@@ -2090,6 +2101,11 @@ struct BindState<Runnable, RunType, void(P1, P2, P3, P4, P5, P6,
P5 p5_;
P6 p6_;
P7 p7_;
+
+ private:
+ ~BindState() override { MaybeRefcount<HasIsMethodTag<Runnable>::value,
+ P1>::Release(p1_); }
+
};
} // namespace internal

Powered by Google App Engine
This is Rietveld 408576698