[Box Backup-commit] COMMIT r3204 - box/trunk/lib/server

[subversion at boxbackup.org]

Author: chris
Date: 2014-02-07 15:44:13 +0000 (Fri, 07 Feb 2014)
New Revision: 3204

Modified:
   box/trunk/lib/server/makeprotocol.pl.in
Log:
Add ReceiveStream to protocol callable base class.

So we can call it on either a Client or a Local protocol object, without
having to know which it is, or cast it.

Modified: box/trunk/lib/server/makeprotocol.pl.in
===================================================================
--- box/trunk/lib/server/makeprotocol.pl.in	2014-02-07 15:44:07 UTC (rev 3203)
+++ box/trunk/lib/server/makeprotocol.pl.in	2014-02-07 15:44:13 UTC (rev 3204)
@@ -512,6 +512,7 @@
 	virtual ~$protocol_base_class();
 	virtual const char *GetIdentString();
 	bool GetLastError(int &rTypeOut, int &rSubTypeOut);
+	virtual std::auto_ptr<IOStream> ReceiveStream() = 0;
 
 protected:
 	void CheckReply(const std::string& requestCommand,
@@ -534,12 +535,6 @@
 	$replyable_base_class();
 	virtual ~$replyable_base_class();
 
-	/*
-	virtual std::auto_ptr<$message_base_class> Receive() = 0;
-	virtual void Send(const ${message_base_class} &rObject) = 0;
-	*/
-
-	virtual std::auto_ptr<IOStream> ReceiveStream() = 0;
 	virtual int GetTimeout() = 0;
 	void SendStreamAfterCommand(std::auto_ptr<IOStream> apStream);
 	
@@ -658,7 +653,6 @@
 class $callable_base_class : public virtual $protocol_base_class
 {
 public:
-	virtual std::auto_ptr<IOStream> ReceiveStream() = 0;
 	virtual int GetTimeout() = 0;
 __E