1 files changed, 21 insertions, 12 deletions

diff --git a/idlc/cpp_gen/cpp_gen_base_cb.h b/idlc/cpp_gen/cpp_gen_base_cb.h
index 3b0e28a..11653ae 100644
--- a/idlc/cpp_gen/cpp_gen_base_cb.h
+++ b/idlc/cpp_gen/cpp_gen_base_cb.h
@@ -58,30 +58,30 @@ const char CB_BUNDLE[] = R"__cls_bundle(class Bundle final {
 
 const char CB_CALLBACK_BASE[] =
 R"__cpp_cb(
-int $$::CallbackBase::seq_num_ = 0;
+int ##::CallbackBase::seq_num_ = 0;
 
-$$::CallbackBase::CallbackBase(int delegate_id, bool once)
+##::CallbackBase::CallbackBase(int delegate_id, bool once)
     : id_(delegate_id), once_(once) {
   seq_id_ = seq_num_++;
 }
 
-int $$::CallbackBase::GetId() const {
+int ##::CallbackBase::GetId() const {
   return id_;
 }
 
-int $$::CallbackBase::GetSeqId() const {
+int ##::CallbackBase::GetSeqId() const {
   return seq_id_;
 }
 
-bool $$::CallbackBase::IsOnce() const {
+bool ##::CallbackBase::IsOnce() const {
   return once_;
 }
 
-std::string $$::CallbackBase::GetTag() const {
+std::string ##::CallbackBase::GetTag() const {
   return std::to_string(id_) + "::" + std::to_string(seq_id_);
 }
 
-rpc_port_parcel_h operator << (rpc_port_parcel_h h, const $$::CallbackBase& cb) {
+rpc_port_parcel_h operator << (rpc_port_parcel_h h, const ##::CallbackBase& cb) {
   rpc_port_parcel_write_int32(h, cb.id_);
   rpc_port_parcel_write_int32(h, cb.seq_id_);
   rpc_port_parcel_write_bool(h, cb.once_);
@@ -89,7 +89,7 @@ rpc_port_parcel_h operator << (rpc_port_parcel_h h, const $$::CallbackBase& cb)
   return h;
 }
 
-rpc_port_parcel_h operator >> (rpc_port_parcel_h h, $$::CallbackBase& cb) {
+rpc_port_parcel_h operator >> (rpc_port_parcel_h h, ##::CallbackBase& cb) {
   rpc_port_parcel_read_int32(h, &cb.id_);
   rpc_port_parcel_read_int32(h, &cb.seq_id_);
   rpc_port_parcel_read_bool(h, &cb.once_);
@@ -144,10 +144,19 @@ R"__cpp_cb(
   };
 )__cpp_cb";
 
+const char CB_CALLBACK_CLASS[] =
+R"__cpp_cb(
+  class $$ : public CallbackBase {
+   public:$$
+$$
+   private:$$
+  };
+)__cpp_cb";
+
 const char CB_CALLBACK_CTOR_STUB[] =
 R"__cpp_cb(
-    $$(rpc_port_parcel_h port, std::weak_ptr<ServiceBase> service)
-        : CallbackBase(static_cast<int>(DelegateId::$$), false) {
+    ##(rpc_port_parcel_h port, std::weak_ptr<ServiceBase> service)
+        : CallbackBase(static_cast<int>(DelegateId::##), false) {
       port_ = port;
       service_ = std::move(service);
     }
@@ -155,8 +164,8 @@ R"__cpp_cb(
 
 const char CB_CALLBACK_CTOR_PROXY[] =
 R"__cpp_cb(
-    $$(bool once = false)
-        : CallbackBase(static_cast<int>(DelegateId::$$), once) {}
+    ##(bool once = false)
+        : CallbackBase(static_cast<int>(DelegateId::##), once) {}
 )__cpp_cb";
 
 const char CB_CALLBACK_PRIVATE_PROXY[] =