qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject qpid-proton git commit: PROTON-1164: [C++ binding] Rename on_unhandled_error -> on_error
Date Wed, 27 Apr 2016 18:45:15 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 0673b55f2 -> 91a1dc1f1


PROTON-1164: [C++ binding] Rename on_unhandled_error -> on_error


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/91a1dc1f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/91a1dc1f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/91a1dc1f

Branch: refs/heads/master
Commit: 91a1dc1f1aeebd438fa99966b93e7c6d7e287aed
Parents: 0673b55
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Wed Apr 27 14:35:15 2016 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Wed Apr 27 14:41:53 2016 -0400

----------------------------------------------------------------------
 examples/cpp/broker.hpp                          |  2 +-
 proton-c/bindings/cpp/include/proton/handler.hpp |  2 +-
 proton-c/bindings/cpp/src/engine_test.cpp        |  2 +-
 proton-c/bindings/cpp/src/handler.cpp            | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/91a1dc1f/examples/cpp/broker.hpp
----------------------------------------------------------------------
diff --git a/examples/cpp/broker.hpp b/examples/cpp/broker.hpp
index 0fc45fa..470e28a 100644
--- a/examples/cpp/broker.hpp
+++ b/examples/cpp/broker.hpp
@@ -201,7 +201,7 @@ class broker_handler : public proton::handler {
         std::cout << "broker client disconnect: " << t.error().what() <<
std::endl;
     }
 
-    void on_unhandled_error(const proton::error_condition &c) override {
+    void on_error(const proton::error_condition &c) override {
         std::cerr << "broker error: " << c.what() << std::endl;
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/91a1dc1f/proton-c/bindings/cpp/include/proton/handler.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/handler.hpp b/proton-c/bindings/cpp/include/proton/handler.hpp
index 4526036..15814cc 100644
--- a/proton-c/bindings/cpp/include/proton/handler.hpp
+++ b/proton-c/bindings/cpp/include/proton/handler.hpp
@@ -150,7 +150,7 @@ PN_CPP_CLASS_EXTERN handler
     /// @endcond
 
     /// Fallback error handling.
-    PN_CPP_EXTERN virtual void on_unhandled_error(const error_condition &c);
+    PN_CPP_EXTERN virtual void on_error(const error_condition &c);
 
     /// @}
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/91a1dc1f/proton-c/bindings/cpp/src/engine_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/engine_test.cpp b/proton-c/bindings/cpp/src/engine_test.cpp
index a6fd71e..5f4b026 100644
--- a/proton-c/bindings/cpp/src/engine_test.cpp
+++ b/proton-c/bindings/cpp/src/engine_test.cpp
@@ -118,7 +118,7 @@ struct record_handler : public handler {
         connection_errors.push_back(c.error().what());
     }
 
-    void on_unhandled_error(const proton::error_condition& c) override {
+    void on_error(const proton::error_condition& c) override {
         unhandled_errors.push_back(c.what());
     }
 };

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/91a1dc1f/proton-c/bindings/cpp/src/handler.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/handler.cpp b/proton-c/bindings/cpp/src/handler.cpp
index d46b880..29f55b4 100644
--- a/proton-c/bindings/cpp/src/handler.cpp
+++ b/proton-c/bindings/cpp/src/handler.cpp
@@ -41,18 +41,18 @@ void handler::on_message(delivery &, message &) {}
 void handler::on_sendable(sender &) {}
 void handler::on_timer(container &) {}
 void handler::on_transport_close(transport &) {}
-void handler::on_transport_error(transport &t) { on_unhandled_error(t.error()); }
+void handler::on_transport_error(transport &t) { on_error(t.error()); }
 void handler::on_connection_close(connection &) {}
-void handler::on_connection_error(connection &c) { on_unhandled_error(c.error()); }
+void handler::on_connection_error(connection &c) { on_error(c.error()); }
 void handler::on_connection_open(connection &) {}
 void handler::on_session_close(session &) {}
-void handler::on_session_error(session &s) { on_unhandled_error(s.error()); }
+void handler::on_session_error(session &s) { on_error(s.error()); }
 void handler::on_session_open(session &) {}
 void handler::on_receiver_close(receiver &) {}
-void handler::on_receiver_error(receiver &l) { on_unhandled_error(l.error()); }
+void handler::on_receiver_error(receiver &l) { on_error(l.error()); }
 void handler::on_receiver_open(receiver &) {}
 void handler::on_sender_close(sender &) {}
-void handler::on_sender_error(sender &l) { on_unhandled_error(l.error()); }
+void handler::on_sender_error(sender &l) { on_error(l.error()); }
 void handler::on_sender_open(sender &) {}
 void handler::on_tracker_accept(tracker &) {}
 void handler::on_tracker_reject(tracker &) {}
@@ -60,6 +60,6 @@ void handler::on_tracker_release(tracker &) {}
 void handler::on_tracker_settle(tracker &) {}
 void handler::on_delivery_settle(delivery &) {}
 
-void handler::on_unhandled_error(const error_condition& c) { throw proton::error(c.what());
}
+void handler::on_error(const error_condition& c) { throw proton::error(c.what()); }
 
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message