diff options
| author | Alan Conway <aconway@apache.org> | 2008-03-25 13:34:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-03-25 13:34:44 +0000 |
| commit | b449826a61eaa0a754e55ca8143882216a07d7e0 (patch) | |
| tree | 9743d3b8a0f5479260beea3a7b47ac1fd8be1801 /cpp/src/qpid/sys/AggregateOutput.cpp | |
| parent | bb542cee9af73a016360aa2d00addfee0206cad8 (diff) | |
| download | qpid-python-b449826a61eaa0a754e55ca8143882216a07d7e0.tar.gz | |
Fix compile errors/warnings with gcc 4.3
- added missing #includes that were implicitly included via old headers.
- add namespace-qualifiers to fix "changes meaning of name" warnings.
- ./qpid/ptr_map.h:51: fixed "qualified return value" warning.
- use const char* for "conversion from string constant to ‘char*’" warnings
Applied patch from https://issues.apache.org/jira/browse/QPID-869
remove depenency on boost/date_time, causes warnings with gcc 4.3.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640806 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/AggregateOutput.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/AggregateOutput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/cpp/src/qpid/sys/AggregateOutput.cpp index 74eea5ed08..57cc0c5a33 100644 --- a/cpp/src/qpid/sys/AggregateOutput.cpp +++ b/cpp/src/qpid/sys/AggregateOutput.cpp @@ -21,6 +21,7 @@ #include "qpid/sys/AggregateOutput.h" #include "qpid/log/Statement.h" +#include <algorithm> namespace qpid { namespace sys { @@ -54,7 +55,7 @@ void AggregateOutput::addOutputTask(OutputTask* t) void AggregateOutput::removeOutputTask(OutputTask* t) { - TaskList::iterator i = find(tasks.begin(), tasks.end(), t); + TaskList::iterator i = std::find(tasks.begin(), tasks.end(), t); if (i != tasks.end()) tasks.erase(i); } |