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 2015/10/23 21:56:15 UTC
qpid-proton git commit: NO-JIRA: c++: Fix 'modifiy' typo,
rename message::user to user_id for consistency.
Repository: qpid-proton
Updated Branches:
refs/heads/master 8d9e82f1c -> 6d7f12dc5
NO-JIRA: c++: Fix 'modifiy' typo, rename message::user to user_id for consistency.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6d7f12dc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6d7f12dc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6d7f12dc
Branch: refs/heads/master
Commit: 6d7f12dc5845f1498ddaef374c6aa547c88dfe45
Parents: 8d9e82f
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Oct 23 15:51:39 2015 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Oct 23 15:51:39 2015 -0400
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/delivery.hpp | 2 +-
proton-c/bindings/cpp/include/proton/message.hpp | 4 ++--
proton-c/bindings/cpp/src/message.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6d7f12dc/proton-c/bindings/cpp/include/proton/delivery.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/delivery.hpp b/proton-c/bindings/cpp/include/proton/delivery.hpp
index 08389c9..35c3b59 100644
--- a/proton-c/bindings/cpp/include/proton/delivery.hpp
+++ b/proton-c/bindings/cpp/include/proton/delivery.hpp
@@ -64,7 +64,7 @@ class delivery : public counted_facade<pn_delivery_t, delivery> {
PN_CPP_EXTERN void release() { settle(RELEASED); }
/** settle with MODIFIED state */
- PN_CPP_EXTERN void modifiy() { settle(MODIFIED); }
+ PN_CPP_EXTERN void modify() { settle(MODIFIED); }
/**
* Check if a delivery is readable.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6d7f12dc/proton-c/bindings/cpp/include/proton/message.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/message.hpp b/proton-c/bindings/cpp/include/proton/message.hpp
index 14eb9a8..61bc04a 100644
--- a/proton-c/bindings/cpp/include/proton/message.hpp
+++ b/proton-c/bindings/cpp/include/proton/message.hpp
@@ -63,8 +63,8 @@ class message
///@ Get message identifier reference, allows modification in-place.
PN_CPP_EXTERN const data& id() const;
- PN_CPP_EXTERN void user(const std::string &user);
- PN_CPP_EXTERN std::string user() const;
+ PN_CPP_EXTERN void user_id(const std::string &user);
+ PN_CPP_EXTERN std::string user_id() const;
PN_CPP_EXTERN void address(const std::string &addr);
PN_CPP_EXTERN std::string address() const;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6d7f12dc/proton-c/bindings/cpp/src/message.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/message.cpp b/proton-c/bindings/cpp/src/message.cpp
index 79c15b8..49f5c79 100644
--- a/proton-c/bindings/cpp/src/message.cpp
+++ b/proton-c/bindings/cpp/src/message.cpp
@@ -67,11 +67,11 @@ void message::id(const data& id) { *data::cast(pn_message_id(message_)) = id; }
const data& message::id() const { return *data::cast(pn_message_id(message_)); }
data& message::id() { return *data::cast(pn_message_id(message_)); }
-void message::user(const std::string &id) {
+void message::user_id(const std::string &id) {
check(pn_message_set_user_id(message_, pn_bytes(id)));
}
-std::string message::user() const {
+std::string message::user_id() const {
return str(pn_message_get_user_id(message_));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org