Mojo: more idiomatic C++ bindings

mojo/public/cpp/bindings/callback.h

 // This file was GENERATED by command:
 //     pump.py callback.h.pump
 // DO NOT EDIT BY HAND!!!
 
 
 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_
 
 #include "mojo/public/cpp/bindings/lib/callback_internal.h"
 #include "mojo/public/cpp/bindings/lib/shared_ptr.h"
+#include "mojo/public/cpp/bindings/lib/template_util.h"
 
 namespace mojo {
 
 template <typename Sig>
 class Callback;
 
 template <>
 class Callback<void()> {
  public:
   struct Runnable {
@@ skipping 45 matching lines @@
 
   // Any class that is copy-constructable and has a compatible Run method may
   // be adapted to a Callback using this constructor.
   template <typename Sink>
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       typename internal::Callback_ParamTraits<A1>::ForwardType a1) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1));
+          internal::Forward(a1));
   }
 
  private:
   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 {
       sink.Run(
-          internal::Callback_Forward(a1));
+          internal::Forward(a1));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2>
 class Callback<void(A1, A2)> {
  public:
@@ skipping 12 matching lines @@
   // Any class that is copy-constructable and has a compatible Run method may
   // be adapted to a Callback using this constructor.
   template <typename Sink>
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       typename internal::Callback_ParamTraits<A1>::ForwardType a1,
       typename internal::Callback_ParamTraits<A2>::ForwardType a2) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2));
+          internal::Forward(a1),
+          internal::Forward(a2));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     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 {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2));
+          internal::Forward(a1),
+          internal::Forward(a2));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2, typename A3>
 class Callback<void(A1, A2, A3)> {
  public:
@@ skipping 14 matching lines @@
   // be adapted to a Callback using this constructor.
   template <typename Sink>
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       typename internal::Callback_ParamTraits<A1>::ForwardType a1,
       typename internal::Callback_ParamTraits<A2>::ForwardType a2,
       typename internal::Callback_ParamTraits<A3>::ForwardType a3) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     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 {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2, typename A3, typename A4>
 class Callback<void(A1, A2, A3, A4)> {
  public:
@@ skipping 16 matching lines @@
   template <typename Sink>
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       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 {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     virtual void Run(
         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 {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5>
 class Callback<void(A1, A2, A3, A4, A5)> {
  public:
@@ skipping 18 matching lines @@
   Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}
 
   void Run(
       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,
       typename internal::Callback_ParamTraits<A5>::ForwardType a5) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     virtual void Run(
         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,
         typename internal::Callback_ParamTraits<A5>::ForwardType a5) const
             MOJO_OVERRIDE {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5,
     typename A6>
 class Callback<void(A1, A2, A3, A4, A5, A6)> {
@@ skipping 21 matching lines @@
 
   void Run(
       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,
       typename internal::Callback_ParamTraits<A5>::ForwardType a5,
       typename internal::Callback_ParamTraits<A6>::ForwardType a6) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5),
-          internal::Callback_Forward(a6));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5),
+          internal::Forward(a6));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     virtual void Run(
         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,
         typename internal::Callback_ParamTraits<A5>::ForwardType a5,
         typename internal::Callback_ParamTraits<A6>::ForwardType a6) const
             MOJO_OVERRIDE {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5),
-          internal::Callback_Forward(a6));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5),
+          internal::Forward(a6));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5,
     typename A6, typename A7>
 class Callback<void(A1, A2, A3, A4, A5, A6, A7)> {
@@ skipping 23 matching lines @@
   void Run(
       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,
       typename internal::Callback_ParamTraits<A5>::ForwardType a5,
       typename internal::Callback_ParamTraits<A6>::ForwardType a6,
       typename internal::Callback_ParamTraits<A7>::ForwardType a7) const {
     if (sink_.get())
       sink_->Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5),
-          internal::Callback_Forward(a6),
-          internal::Callback_Forward(a7));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5),
+          internal::Forward(a6),
+          internal::Forward(a7));
   }
 
  private:
   template <typename Sink>
   struct Adapter : public Runnable {
     explicit Adapter(const Sink& sink) : sink(sink) {}
     virtual void Run(
         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,
         typename internal::Callback_ParamTraits<A5>::ForwardType a5,
         typename internal::Callback_ParamTraits<A6>::ForwardType a6,
         typename internal::Callback_ParamTraits<A7>::ForwardType a7) const
             MOJO_OVERRIDE {
       sink.Run(
-          internal::Callback_Forward(a1),
-          internal::Callback_Forward(a2),
-          internal::Callback_Forward(a3),
-          internal::Callback_Forward(a4),
-          internal::Callback_Forward(a5),
-          internal::Callback_Forward(a6),
-          internal::Callback_Forward(a7));
+          internal::Forward(a1),
+          internal::Forward(a2),
+          internal::Forward(a3),
+          internal::Forward(a4),
+          internal::Forward(a5),
+          internal::Forward(a6),
+          internal::Forward(a7));
     }
     Sink sink;
   };
 
   internal::SharedPtr<Runnable> sink_;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_CALLBACK_H_