diff options
| author | Alan Conway <aconway@apache.org> | 2007-11-28 17:13:28 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-11-28 17:13:28 +0000 |
| commit | acd260bce099be36b879826a0921daf9cb2fe140 (patch) | |
| tree | 7f1c708dafa7a1399b62ef9316550b17d19ace3d /qpid/cpp/src/tests/interop_runner.cpp | |
| parent | e427d74267a1a11238425fc540ab84cde2474a3e (diff) | |
| download | qpid-python-acd260bce099be36b879826a0921daf9cb2fe140.tar.gz | |
Fixed to build with boost 1.34 as well as boost 1.33
- boost::ptr_map API changed.
- Boost.Test unit test framework changes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@599067 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/interop_runner.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/interop_runner.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/interop_runner.cpp b/qpid/cpp/src/tests/interop_runner.cpp index 56f9cbf3d2..824af7f3b7 100644 --- a/qpid/cpp/src/tests/interop_runner.cpp +++ b/qpid/cpp/src/tests/interop_runner.cpp @@ -20,6 +20,7 @@ */ #include "qpid/Options.h" +#include "qpid/ptr_map.h" #include "qpid/Exception.h" #include "qpid/client/Channel.h" #include "qpid/client/Connection.h" @@ -71,7 +72,7 @@ class Listener : public MessageListener, private Runnable{ TestMap tests; const string name; const string topic; - TestMap::iterator test; + TestCase* test; auto_ptr<Thread> runner; ReplyTo reportTo; string reportCorrelator; @@ -186,7 +187,7 @@ void Listener::received(Message& message) test->stop(); sendReport(); } else if (type == "TERMINATE") { - if (test != tests.end()) test->stop(); + if (test) test->stop(); shutdown(); } else { cerr <<"ERROR!: Received unknown control message: " << type << endl; @@ -201,8 +202,9 @@ void Listener::shutdown() bool Listener::invite(const string& name) { - test = tests.find(name); - return test != tests.end(); + TestMap::iterator i = tests.find(name); + test = (i != tests.end()) ? qpid::ptr_map::get_pointer(i) : 0; + return test; } void Listener::run() |