add PushCallbackDemo

examples/PushCallbackDemo/Server/Hello.h

@@ -1,6 +1,10 @@
 // **********************************************************************
 // This file was generated by a TARS parser!
+<<<<<<< HEAD
 // TARS version 3.0.13.
+=======
+// TARS version 3.0.12.
+>>>>>>> add PushCallbackDemo
 // **********************************************************************
 
 #ifndef __HELLO_H_

examples/PushCallbackDemo/Server/Push.h

@@ -1,6 +1,10 @@
 // **********************************************************************
 // This file was generated by a TARS parser!
+<<<<<<< HEAD
 // TARS version 3.0.13.
+=======
+// TARS version 3.0.12.
+>>>>>>> add PushCallbackDemo
 // **********************************************************************
 
 #ifndef __PUSH_H_
@@ -30,8 +34,11 @@ namespace TestApp
         { throw std::runtime_error("callback_pushMsg() override incorrect."); }
         virtual void callback_pushMsg_exception(tars::Int32 ret)
         { throw std::runtime_error("callback_pushMsg_exception() override incorrect."); }
+<<<<<<< HEAD
         virtual void callback_pushMsg(tars::Int32 ret, std::string&&  sRsp)
         { callback_pushMsg(ret, sRsp); }
+=======
+>>>>>>> add PushCallbackDemo
 
     public:
         virtual const map<std::string, std::string> & getResponseContext() const
@@ -98,7 +105,11 @@ namespace TestApp
 
                     pCbtd->setResponseContext(_msg_->response->context);
 
+<<<<<<< HEAD
                     callback_pushMsg(_ret, std::move(sRsp));
+=======
+                    callback_pushMsg(_ret, sRsp);
+>>>>>>> add PushCallbackDemo
 
                     pCbtd->delResponseContext();
 
@@ -248,7 +259,11 @@ namespace TestApp
                         _is.read(sRsp, 1, true);
                         setResponseContext(_msg_->response->context);
 
+<<<<<<< HEAD
                         callback_pushMsg(_ret, std::move(sRsp));
+=======
+                        callback_pushMsg(_ret, sRsp);
+>>>>>>> add PushCallbackDemo
 
                     }
                     catch(std::exception &ex)