You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/09/05 16:13:34 UTC
[2/2] qpid-proton git commit: NO-JIRA: c++ remove references to
deprecated default_container
NO-JIRA: c++ remove references to deprecated default_container
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2081acbf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2081acbf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2081acbf
Branch: refs/heads/master
Commit: 2081acbf591fe05125c8830c652f75515ac82514
Parents: e631bf6
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Sep 1 15:51:45 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Sep 5 12:12:33 2017 -0400
----------------------------------------------------------------------
examples/cpp/broker.cpp | 1 -
examples/cpp/client.cpp | 3 +--
examples/cpp/connection_options.cpp | 3 +--
examples/cpp/direct_recv.cpp | 3 +--
examples/cpp/direct_send.cpp | 3 +--
examples/cpp/flow_control.cpp | 3 +--
examples/cpp/helloworld.cpp | 3 +--
examples/cpp/helloworld_direct.cpp | 3 +--
examples/cpp/queue_browser.cpp | 3 +--
examples/cpp/scheduled_send.cpp | 3 +--
examples/cpp/scheduled_send_03.cpp | 3 +--
examples/cpp/selected_recv.cpp | 3 +--
examples/cpp/server.cpp | 3 +--
examples/cpp/server_direct.cpp | 3 +--
examples/cpp/service_bus.cpp | 3 +--
examples/cpp/simple_recv.cpp | 3 +--
examples/cpp/simple_send.cpp | 3 +--
examples/cpp/ssl.cpp | 3 +--
examples/cpp/ssl_client_cert.cpp | 3 +--
examples/cpp/tutorial.dox | 8 ++++----
proton-c/bindings/cpp/docs/main.md | 4 ++--
.../bindings/cpp/include/proton/default_container.hpp | 1 +
proton-c/bindings/cpp/src/container_test.cpp | 11 +++++------
tests/tools/apps/cpp/reactor_send.cpp | 3 +--
24 files changed, 31 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/broker.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/broker.cpp b/examples/cpp/broker.cpp
index 6ce7965..60b5a05 100644
--- a/examples/cpp/broker.cpp
+++ b/examples/cpp/broker.cpp
@@ -22,7 +22,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/error_condition.hpp>
#include <proton/function.hpp>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/client.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/client.cpp b/examples/cpp/client.cpp
index 81a9a32..a9d5dbe 100644
--- a/examples/cpp/client.cpp
+++ b/examples/cpp/client.cpp
@@ -22,7 +22,6 @@
#include "options.hpp"
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
@@ -97,7 +96,7 @@ int main(int argc, char **argv) {
requests.push_back("And the mome raths outgrabe.");
client c(url, requests);
- proton::default_container(c).run();
+ proton::container(c).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/connection_options.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/connection_options.cpp b/examples/cpp/connection_options.cpp
index a696c6d..df26100 100644
--- a/examples/cpp/connection_options.cpp
+++ b/examples/cpp/connection_options.cpp
@@ -22,7 +22,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/messaging_handler.hpp>
#include <proton/transport.hpp>
@@ -65,7 +64,7 @@ int main(int argc, char **argv) {
try {
std::string url = argc > 1 ? argv[1] : "127.0.0.1:5672/examples";
main_handler handler(url);
- proton::default_container container(handler);
+ proton::container container(handler);
// Global connection options for future connections on container.
container.client_connection_options(connection_options().max_frame_size(12345).idle_timeout(proton::duration(15000)));
container.run();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/direct_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/direct_recv.cpp b/examples/cpp/direct_recv.cpp
index 705b480..c98a4bf 100644
--- a/examples/cpp/direct_recv.cpp
+++ b/examples/cpp/direct_recv.cpp
@@ -23,7 +23,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
@@ -82,7 +81,7 @@ int main(int argc, char **argv) {
opts.parse();
direct_recv recv(address, message_count);
- proton::default_container(recv).run();
+ proton::container(recv).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/direct_send.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/direct_send.cpp b/examples/cpp/direct_send.cpp
index 7de762d..2a2b3e2 100644
--- a/examples/cpp/direct_send.cpp
+++ b/examples/cpp/direct_send.cpp
@@ -23,7 +23,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
@@ -94,7 +93,7 @@ int main(int argc, char **argv) {
opts.parse();
simple_send send(address, message_count);
- proton::default_container(send).run();
+ proton::container(send).run();
return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/flow_control.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/flow_control.cpp b/examples/cpp/flow_control.cpp
index 7b1474e..3773454 100644
--- a/examples/cpp/flow_control.cpp
+++ b/examples/cpp/flow_control.cpp
@@ -24,7 +24,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
@@ -237,7 +236,7 @@ int main(int argc, char **argv) {
verbose = false;
flow_control fc(address);
- proton::default_container(fc).run();
+ proton::container(fc).run();
return 0;
} catch (const std::exception& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/helloworld.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/helloworld.cpp b/examples/cpp/helloworld.cpp
index 404d822..b9f5b45 100644
--- a/examples/cpp/helloworld.cpp
+++ b/examples/cpp/helloworld.cpp
@@ -21,7 +21,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
@@ -65,7 +64,7 @@ int main(int argc, char **argv) {
std::string url = argc > 1 ? argv[1] : "127.0.0.1:5672/examples";
hello_world hw(url);
- proton::default_container(hw).run();
+ proton::container(hw).run();
return 0;
} catch (const std::exception& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/helloworld_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/helloworld_direct.cpp b/examples/cpp/helloworld_direct.cpp
index f879edd..085db0f 100644
--- a/examples/cpp/helloworld_direct.cpp
+++ b/examples/cpp/helloworld_direct.cpp
@@ -21,7 +21,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
@@ -71,7 +70,7 @@ int main(int argc, char **argv) {
std::string url = argc > 1 ? argv[1] : "127.0.0.1:8888/examples";
hello_world_direct hwd(url);
- proton::default_container(hwd).run();
+ proton::container(hwd).run();
return 0;
} catch (const std::exception& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/queue_browser.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/queue_browser.cpp b/examples/cpp/queue_browser.cpp
index ef158b5..4e1c6de 100644
--- a/examples/cpp/queue_browser.cpp
+++ b/examples/cpp/queue_browser.cpp
@@ -21,7 +21,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
@@ -58,7 +57,7 @@ int main(int argc, char **argv) {
std::string url = argc > 1 ? argv[1] : "127.0.0.1:5672/examples";
browser b(url);
- proton::default_container(b).run();
+ proton::container(b).run();
return 0;
} catch (const std::exception& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/scheduled_send.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/scheduled_send.cpp b/examples/cpp/scheduled_send.cpp
index 4c71482..867b0df 100644
--- a/examples/cpp/scheduled_send.cpp
+++ b/examples/cpp/scheduled_send.cpp
@@ -23,7 +23,6 @@
#include <proton/container.hpp>
#include <proton/connection.hpp>
-#include <proton/default_container.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
#include <proton/sender.hpp>
@@ -110,7 +109,7 @@ int main(int argc, char **argv) {
try {
opts.parse();
scheduled_sender h(address, interval, timeout);
- proton::default_container(h).run();
+ proton::container(h).run();
return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/scheduled_send_03.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/scheduled_send_03.cpp b/examples/cpp/scheduled_send_03.cpp
index 20972e4..8f058c7 100644
--- a/examples/cpp/scheduled_send_03.cpp
+++ b/examples/cpp/scheduled_send_03.cpp
@@ -23,7 +23,6 @@
#include <proton/container.hpp>
#include <proton/connection.hpp>
-#include <proton/default_container.hpp>
#include <proton/duration.hpp>
#include <proton/function.hpp>
#include <proton/message.hpp>
@@ -107,7 +106,7 @@ int main(int argc, char **argv) {
try {
opts.parse();
scheduled_sender h(address, interval, timeout);
- proton::default_container(h).run();
+ proton::container(h).run();
return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/selected_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/selected_recv.cpp b/examples/cpp/selected_recv.cpp
index 771fb29..65e88e1 100644
--- a/examples/cpp/selected_recv.cpp
+++ b/examples/cpp/selected_recv.cpp
@@ -21,7 +21,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
#include <proton/receiver_options.hpp>
@@ -79,7 +78,7 @@ int main(int argc, char **argv) {
std::string url = argc > 1 ? argv[1] : "127.0.0.1:5672/examples";
selected_recv recv(url);
- proton::default_container(recv).run();
+ proton::container(recv).run();
return 0;
} catch (const std::exception& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/server.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp
index 573b3a0..d5e6b36 100644
--- a/examples/cpp/server.cpp
+++ b/examples/cpp/server.cpp
@@ -23,7 +23,6 @@
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
#include <proton/messaging_handler.hpp>
@@ -90,7 +89,7 @@ int main(int argc, char **argv) {
opts.parse();
server srv(address);
- proton::default_container(srv).run();
+ proton::container(srv).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/server_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server_direct.cpp b/examples/cpp/server_direct.cpp
index 22d519a..3bfd60a 100644
--- a/examples/cpp/server_direct.cpp
+++ b/examples/cpp/server_direct.cpp
@@ -22,7 +22,6 @@
#include "options.hpp"
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
@@ -111,7 +110,7 @@ int main(int argc, char **argv) {
opts.parse();
server srv(address);
- proton::default_container(srv).run();
+ proton::container(srv).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/service_bus.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/service_bus.cpp b/examples/cpp/service_bus.cpp
index 2c7a682..7f9e3eb 100644
--- a/examples/cpp/service_bus.cpp
+++ b/examples/cpp/service_bus.cpp
@@ -85,7 +85,6 @@ Done. No more messages.
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/function.hpp>
#include <proton/message.hpp>
@@ -325,7 +324,7 @@ int main(int argc, char **argv) {
std::string connection_string("amqps://" + sb_key_name + ":" + sb_key + "@" + sb_namespace);
sequence seq(connection_string, sb_entity);
- proton::default_container(seq).run();
+ proton::container(seq).run();
return 0;
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/simple_recv.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/simple_recv.cpp b/examples/cpp/simple_recv.cpp
index 93b4868..39b4dfd 100644
--- a/examples/cpp/simple_recv.cpp
+++ b/examples/cpp/simple_recv.cpp
@@ -24,7 +24,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/delivery.hpp>
#include <proton/link.hpp>
#include <proton/message.hpp>
@@ -92,7 +91,7 @@ int main(int argc, char **argv) {
opts.parse();
simple_recv recv(address, user, password, message_count);
- proton::default_container(recv).run();
+ proton::container(recv).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/simple_send.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/simple_send.cpp b/examples/cpp/simple_send.cpp
index ebc02cb..a4c2272 100644
--- a/examples/cpp/simple_send.cpp
+++ b/examples/cpp/simple_send.cpp
@@ -24,7 +24,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
#include <proton/messaging_handler.hpp>
@@ -101,7 +100,7 @@ int main(int argc, char **argv) {
opts.parse();
simple_send send(address, user, password, message_count);
- proton::default_container(send).run();
+ proton::container(send).run();
return 0;
} catch (const example::bad_option& e) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/ssl.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/ssl.cpp b/examples/cpp/ssl.cpp
index e24961f..32eaca7 100644
--- a/examples/cpp/ssl.cpp
+++ b/examples/cpp/ssl.cpp
@@ -24,7 +24,6 @@
#include <proton/connection_options.hpp>
#include <proton/connection.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/error_condition.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
@@ -179,7 +178,7 @@ int main(int argc, char **argv) {
throw std::runtime_error("bad verify argument: " + verify);
hello_world_direct hwd(address);
- proton::default_container(hwd).run();
+ proton::container(hwd).run();
return 0;
} catch (const std::exception& e) {
if (verify_failed) {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/ssl_client_cert.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/ssl_client_cert.cpp b/examples/cpp/ssl_client_cert.cpp
index c6c7666..96ee122 100644
--- a/examples/cpp/ssl_client_cert.cpp
+++ b/examples/cpp/ssl_client_cert.cpp
@@ -22,7 +22,6 @@
#include <proton/connection.hpp>
#include <proton/connection_options.hpp>
#include <proton/container.hpp>
-#include <proton/default_container.hpp>
#include <proton/listener.hpp>
#include <proton/message.hpp>
#include <proton/messaging_handler.hpp>
@@ -142,7 +141,7 @@ int main(int argc, char **argv) {
else cert_directory = "ssl_certs/";
hello_world_direct hwd(url);
- proton::default_container(hwd).run();
+ proton::container(hwd).run();
return 0;
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/examples/cpp/tutorial.dox
----------------------------------------------------------------------
diff --git a/examples/cpp/tutorial.dox b/examples/cpp/tutorial.dox
index fef08be..fbb419d 100644
--- a/examples/cpp/tutorial.dox
+++ b/examples/cpp/tutorial.dox
@@ -18,7 +18,7 @@ functions that react to various AMQP events (connections opening and
closing, messages being delivered, and so on).
The examples below show how to implement handlers for clients and
-servers and how to run them using the `proton::default_container`, a
+servers and how to run them using the `proton::container`, a
portable, easy-to-use way to build single-threaded clients or servers.
Some of the examples require an AMQP *broker* that can receive, store, and send
@@ -53,7 +53,7 @@ and then receiving the same message back. In a realistic system the
sender and receiver would normally be in different processes. The
complete example is @ref helloworld.cpp
-We will include the following classes: `proton::default_container` (an
+We will include the following classes: `proton::container` (an
implementation of `proton::container`) runs an event loop which
dispatches events to a `proton::messaging_handler`. This allows a
*reactive* style of programming which is well suited to messaging
@@ -100,8 +100,8 @@ The message body is a `proton::value`, see the documentation for more on how to
extract the message body as type-safe C++ values.
Our `main` function creates an instance of the `hello_world` handler
-and a `proton::default_container` using that handler. Calling
-`proton::container::run` sets things in motion and returns when we
+and a `proton::container` using that handler. Calling
+`proton::container::run()` sets things in motion and returns when we
close the connection as there is nothing further to do. It may throw
an exception, which will be a subclass of `proton::error`. That in
turn is a subclass of `std::exception`.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/proton-c/bindings/cpp/docs/main.md
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/docs/main.md b/proton-c/bindings/cpp/docs/main.md
index 93ba2c0..bd44e0b 100644
--- a/proton-c/bindings/cpp/docs/main.md
+++ b/proton-c/bindings/cpp/docs/main.md
@@ -112,7 +112,7 @@ different types of application. All of them use the same
`proton::messaging_handler` subclasses so code can be re-used if you
change your approach.
-### %proton::default_container - Easy single-threaded applications
+### %proton::container - Easy single-threaded applications
`proton::container` is the top-level object in a proton application.
Use proton::container::connect() and proton::container::listen() to
@@ -120,7 +120,7 @@ create connections. The container polls multiple connections and calls
protocol events on your `proton::messaging_handler` subclasses.
The default container implementation is created using
-`proton::default_container`.
+`proton::container`.
You can implement your own container to integrate proton with any IO
provider using the `proton::io::connection_driver`.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/proton-c/bindings/cpp/include/proton/default_container.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/default_container.hpp b/proton-c/bindings/cpp/include/proton/default_container.hpp
index 0f245a0..633cfc9 100644
--- a/proton-c/bindings/cpp/include/proton/default_container.hpp
+++ b/proton-c/bindings/cpp/include/proton/default_container.hpp
@@ -25,6 +25,7 @@
namespace proton {
/// @cond INTERNAL
+/// default_container no longer exists as a separate class. Use `container`.
typedef class container default_container;
/// @endcond
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/proton-c/bindings/cpp/src/container_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/container_test.cpp b/proton-c/bindings/cpp/src/container_test.cpp
index 498b217..ab7bfc7 100644
--- a/proton-c/bindings/cpp/src/container_test.cpp
+++ b/proton-c/bindings/cpp/src/container_test.cpp
@@ -22,7 +22,6 @@
#include "proton/connection.hpp"
#include "proton/connection_options.hpp"
#include "proton/container.hpp"
-#include "proton/default_container.hpp"
#include "proton/messaging_handler.hpp"
#include "proton/listener.hpp"
#include "proton/listen_handler.hpp"
@@ -93,7 +92,7 @@ int test_container_vhost() {
proton::connection_options opts;
opts.virtual_host(std::string("a.b.c"));
test_handler th(std::string("127.0.0.1"), opts);
- proton::default_container(th).run();
+ proton::container(th).run();
ASSERT_EQUAL(th.peer_vhost, std::string("a.b.c"));
return 0;
}
@@ -101,7 +100,7 @@ int test_container_vhost() {
int test_container_default_vhost() {
proton::connection_options opts;
test_handler th(std::string("127.0.0.1"), opts);
- proton::default_container(th).run();
+ proton::container(th).run();
ASSERT_EQUAL(th.peer_vhost, std::string("127.0.0.1"));
return 0;
}
@@ -114,7 +113,7 @@ int test_container_no_vhost() {
proton::connection_options opts;
opts.virtual_host(std::string(""));
test_handler th(std::string("127.0.0.1"), opts);
- proton::default_container(th).run();
+ proton::container(th).run();
ASSERT_EQUAL(th.peer_vhost, std::string(""));
return 0;
}
@@ -135,7 +134,7 @@ int test_container_bad_address() {
// Listen on a bad address, check for leaks
// Regression test for https://issues.apache.org/jira/browse/PROTON-1217
- proton::default_container c;
+ proton::container c;
// Default fixed-option listener. Valgrind for leaks.
try { c.listen("999.666.999.666:0"); } catch (const proton::error&) {}
c.run();
@@ -191,7 +190,7 @@ public:
int test_container_stop() {
stop_tester t;
- proton::default_container(t).run();
+ proton::container(t).run();
ASSERT(t.state==5);
return 0;
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2081acbf/tests/tools/apps/cpp/reactor_send.cpp
----------------------------------------------------------------------
diff --git a/tests/tools/apps/cpp/reactor_send.cpp b/tests/tools/apps/cpp/reactor_send.cpp
index 62ac4ce..a80da6e 100644
--- a/tests/tools/apps/cpp/reactor_send.cpp
+++ b/tests/tools/apps/cpp/reactor_send.cpp
@@ -25,7 +25,6 @@
#include "proton/codec/decoder.hpp"
#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/default_container.hpp"
#include "proton/delivery.hpp"
#include "proton/message.hpp"
#include "proton/message_id.hpp"
@@ -123,7 +122,7 @@ int main(int argc, char **argv) {
try {
opts.parse();
reactor_send send(address, message_count, message_size, replying);
- proton::default_container(send).run();
+ proton::container(send).run();
return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org