| Index: mojo/public/cpp/bindings/callback.h
|
| diff --git a/mojo/public/cpp/bindings/callback.h b/mojo/public/cpp/bindings/callback.h
|
| index 8d39b0231da927cdd068d3a19e5e3f3d94cb24ad..148677637eae0f0b5f38dbac4ab43ce0271e39c8 100644
|
| --- a/mojo/public/cpp/bindings/callback.h
|
| +++ b/mojo/public/cpp/bindings/callback.h
|
| @@ -51,9 +51,7 @@ class Callback<void()> {
|
| template <typename Sink>
|
| struct Adapter : public Runnable {
|
| explicit Adapter(const Sink& sink) : sink(sink) {}
|
| - virtual void Run() const MOJO_OVERRIDE {
|
| - sink.Run();
|
| - }
|
| + virtual void Run() const override { sink.Run(); }
|
| Sink sink;
|
| };
|
|
|
| @@ -92,9 +90,8 @@ class Callback<void(A1)> {
|
| template <typename Sink>
|
| struct Adapter : public Runnable {
|
| explicit Adapter(const Sink& sink) : sink(sink) {}
|
| - virtual void Run(
|
| - typename internal::Callback_ParamTraits<A1>::ForwardType a1) const
|
| - MOJO_OVERRIDE {
|
| + virtual void Run(typename internal::Callback_ParamTraits<A1>::ForwardType
|
| + a1) const override {
|
| sink.Run(internal::Forward(a1));
|
| }
|
| Sink sink;
|
| @@ -142,8 +139,8 @@ class Callback<void(A1, A2)> {
|
| explicit Adapter(const Sink& sink) : sink(sink) {}
|
| virtual void Run(
|
| typename internal::Callback_ParamTraits<A1>::ForwardType a1,
|
| - typename internal::Callback_ParamTraits<A2>::ForwardType a2) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A2>::ForwardType a2)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2));
|
| @@ -197,8 +194,8 @@ class Callback<void(A1, A2, A3)> {
|
| virtual void Run(
|
| typename internal::Callback_ParamTraits<A1>::ForwardType a1,
|
| typename internal::Callback_ParamTraits<A2>::ForwardType a2,
|
| - typename internal::Callback_ParamTraits<A3>::ForwardType a3) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A3>::ForwardType a3)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2),
|
| @@ -257,8 +254,8 @@ class Callback<void(A1, A2, A3, A4)> {
|
| typename internal::Callback_ParamTraits<A1>::ForwardType a1,
|
| typename internal::Callback_ParamTraits<A2>::ForwardType a2,
|
| typename internal::Callback_ParamTraits<A3>::ForwardType a3,
|
| - typename internal::Callback_ParamTraits<A4>::ForwardType a4) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A4>::ForwardType a4)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2),
|
| @@ -322,8 +319,8 @@ class Callback<void(A1, A2, A3, A4, A5)> {
|
| typename internal::Callback_ParamTraits<A2>::ForwardType a2,
|
| typename internal::Callback_ParamTraits<A3>::ForwardType a3,
|
| typename internal::Callback_ParamTraits<A4>::ForwardType a4,
|
| - typename internal::Callback_ParamTraits<A5>::ForwardType a5) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A5>::ForwardType a5)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2),
|
| @@ -393,8 +390,8 @@ class Callback<void(A1, A2, A3, A4, A5, A6)> {
|
| typename internal::Callback_ParamTraits<A3>::ForwardType a3,
|
| typename internal::Callback_ParamTraits<A4>::ForwardType a4,
|
| typename internal::Callback_ParamTraits<A5>::ForwardType a5,
|
| - typename internal::Callback_ParamTraits<A6>::ForwardType a6) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A6>::ForwardType a6)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2),
|
| @@ -469,8 +466,8 @@ class Callback<void(A1, A2, A3, A4, A5, A6, A7)> {
|
| typename internal::Callback_ParamTraits<A4>::ForwardType a4,
|
| typename internal::Callback_ParamTraits<A5>::ForwardType a5,
|
| typename internal::Callback_ParamTraits<A6>::ForwardType a6,
|
| - typename internal::Callback_ParamTraits<A7>::ForwardType a7) const
|
| - MOJO_OVERRIDE {
|
| + typename internal::Callback_ParamTraits<A7>::ForwardType a7)
|
| + const override {
|
| sink.Run(
|
| internal::Forward(a1),
|
| internal::Forward(a2),
|
|
|