diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx index 7e82d0fa..44ab1918 100644 --- a/fairmq/FairMQChannel.cxx +++ b/fairmq/FairMQChannel.cxx @@ -5,12 +5,6 @@ * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ -/** - * FairMQChannel.cxx - * - * @since 2015-06-02 - * @author A. Rybalchenko - */ #include "FairMQChannel.h" #include diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index ac132484..02263015 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -247,17 +247,6 @@ class FairMQChannel return fSocket->Receive(msg, rcvTimeoutInMs); } - int SendAsync(FairMQMessagePtr& msg) __attribute__((deprecated("For non-blocking Send, use timeout version with timeout of 0: Send(msg, timeout);"))) - { - CheckSendCompatibility(msg); - return fSocket->Send(msg, 0); - } - int ReceiveAsync(FairMQMessagePtr& msg) __attribute__((deprecated("For non-blocking Receive, use timeout version with timeout of 0: Receive(msg, timeout);"))) - { - CheckReceiveCompatibility(msg); - return fSocket->Receive(msg, 0); - } - /// Send a vector of messages /// @param msgVec message vector reference /// @param sndTimeoutInMs send timeout in ms. -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot send) @@ -278,17 +267,6 @@ class FairMQChannel return fSocket->Receive(msgVec, rcvTimeoutInMs); } - int64_t SendAsync(std::vector& msgVec) __attribute__((deprecated("For non-blocking Send, use timeout version with timeout of 0: Send(msgVec, timeout);"))) - { - CheckSendCompatibility(msgVec); - return fSocket->Send(msgVec, 0); - } - int64_t ReceiveAsync(std::vector& msgVec) __attribute__((deprecated("For non-blocking Receive, use timeout version with timeout of 0: Receive(msgVec, timeout);"))) - { - CheckReceiveCompatibility(msgVec); - return fSocket->Receive(msgVec, 0); - } - /// Send FairMQParts /// @param parts FairMQParts reference /// @param sndTimeoutInMs send timeout in ms. -1 will wait forever (or until interrupt (e.g. via state change)), 0 will not wait (return immediately if cannot send) @@ -307,16 +285,6 @@ class FairMQChannel return Receive(parts.fParts, rcvTimeoutInMs); } - int64_t SendAsync(FairMQParts& parts) __attribute__((deprecated("For non-blocking Send, use timeout version with timeout of 0: Send(parts, timeout);"))) - { - return Send(parts.fParts, 0); - } - - int64_t ReceiveAsync(FairMQParts& parts) __attribute__((deprecated("For non-blocking Receive, use timeout version with timeout of 0: Receive(parts, timeout);"))) - { - return Receive(parts.fParts, 0); - } - unsigned long GetBytesTx() const { return fSocket->GetBytesTx(); } unsigned long GetBytesRx() const { return fSocket->GetBytesRx(); } unsigned long GetMessagesTx() const { return fSocket->GetMessagesTx(); }