diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-04 14:27:40 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-04 14:27:40 +0000 |
| commit | 69aed09e38db75ccdd89c2146c066e60a6ab1011 (patch) | |
| tree | 32f06aa8db5d813573e97c737d0036c1aa580904 /cpp/src/qpid/sys/AggregateOutput.h | |
| parent | b384e8073b2202db2142ebf9f9d9673483cde72f (diff) | |
| download | qpid-python-69aed09e38db75ccdd89c2146c066e60a6ab1011.tar.gz | |
QPID-4905: Tidy up
- Remove unused function getBuffered() of ConnectionOutputHandler
- Stop SessionContext and AggregateOutput from needlessly implementing
the OutputControl interface
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1489457 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/AggregateOutput.h')
| -rw-r--r-- | cpp/src/qpid/sys/AggregateOutput.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/cpp/src/qpid/sys/AggregateOutput.h index e9dbd5a4cc..c8dd8d989a 100644 --- a/cpp/src/qpid/sys/AggregateOutput.h +++ b/cpp/src/qpid/sys/AggregateOutput.h @@ -22,8 +22,8 @@ #define _AggregateOutput_ #include "qpid/sys/Monitor.h" -#include "qpid/sys/OutputControl.h" #include "qpid/sys/OutputTask.h" + #include "qpid/CommonImportExport.h" #include <algorithm> @@ -42,7 +42,7 @@ namespace sys { * doOutput is called in another. */ -class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask, public OutputControl +class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask { typedef std::deque<OutputTask*> TaskList; typedef std::set<OutputTask*> TaskSet; @@ -51,14 +51,11 @@ class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask, public Outpu TaskList tasks; TaskSet taskSet; bool busy; - OutputControl& control; public: - QPID_COMMON_EXTERN AggregateOutput(OutputControl& c); + QPID_COMMON_EXTERN AggregateOutput(); // These may be called concurrently with any function. - QPID_COMMON_EXTERN void abort(); - QPID_COMMON_EXTERN void activateOutput(); QPID_COMMON_EXTERN void addOutputTask(OutputTask* t); // These functions must not be called concurrently with each other. |