Repository: qpid-proton Updated Branches: refs/heads/master deccf354a -> ab8a5d827
NO-JIRA: c++ duration/timestamp: drop ms() use milliseconds() only. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ab8a5d82 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ab8a5d82 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ab8a5d82 Branch: refs/heads/master Commit: ab8a5d8279a03f648d011aaf63bb04ab6179ae04 Parents: deccf35 Author: Alan Conway <[email protected]> Authored: Wed Apr 27 11:57:43 2016 -0400 Committer: Alan Conway <[email protected]> Committed: Wed Apr 27 11:57:43 2016 -0400 ---------------------------------------------------------------------- proton-c/bindings/cpp/include/proton/duration.hpp | 13 ++++++------- proton-c/bindings/cpp/include/proton/timestamp.hpp | 9 ++++----- proton-c/bindings/cpp/src/connection_options.cpp | 2 +- proton-c/bindings/cpp/src/duration.cpp | 2 +- proton-c/bindings/cpp/src/encoder.cpp | 2 +- proton-c/bindings/cpp/src/message.cpp | 6 +++--- proton-c/bindings/cpp/src/message_test.cpp | 12 ++++++------ proton-c/bindings/cpp/src/reactor.cpp | 4 ++-- proton-c/bindings/cpp/src/reconnect_timer.cpp | 2 +- proton-c/bindings/cpp/src/scalar_base.cpp | 2 +- proton-c/bindings/cpp/src/timestamp.cpp | 2 +- 11 files changed, 27 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/include/proton/duration.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/duration.hpp b/proton-c/bindings/cpp/include/proton/duration.hpp index 9d41d2d..c5f75d7 100644 --- a/proton-c/bindings/cpp/include/proton/duration.hpp +++ b/proton-c/bindings/cpp/include/proton/duration.hpp @@ -33,13 +33,12 @@ namespace proton { /// A span of time in milliseconds. class duration : private comparable<duration> { public: - typedef uint64_t numeric_type; ///< Numeric type used to store milliseconds + typedef int64_t numeric_type; ///< Numeric type used to store milliseconds explicit duration(numeric_type ms = 0) : ms_(ms) {} ///< Construct from milliseconds duration& operator=(numeric_type ms) { ms_ = ms; return *this; } ///< Assign numeric_type milliseconds() const { return ms_; } ///< Return milliseconds - numeric_type ms() const { return ms_; } ///< Return milliseconds PN_CPP_EXTERN static const duration FOREVER; ///< Wait for ever PN_CPP_EXTERN static const duration IMMEDIATE; ///< Don't wait at all @@ -55,12 +54,12 @@ PN_CPP_EXTERN std::ostream& operator<<(std::ostream&, duration); ///@name Comparison and arithmetic operators ///@{ -inline bool operator<(duration x, duration y) { return x.ms() < y.ms(); } -inline bool operator==(duration x, duration y) { return x.ms() == y.ms(); } +inline bool operator<(duration x, duration y) { return x.milliseconds() < y.milliseconds(); } +inline bool operator==(duration x, duration y) { return x.milliseconds() == y.milliseconds(); } -inline duration operator+(duration x, duration y) { return duration(x.ms() + y.ms()); } -inline duration operator-(duration x, duration y) { return duration(x.ms() - y.ms()); } -inline duration operator*(duration d, uint64_t n) { return duration(d.ms()*n); } +inline duration operator+(duration x, duration y) { return duration(x.milliseconds() + y.milliseconds()); } +inline duration operator-(duration x, duration y) { return duration(x.milliseconds() - y.milliseconds()); } +inline duration operator*(duration d, uint64_t n) { return duration(d.milliseconds()*n); } inline duration operator*(uint64_t n, duration d) { return d * n; } ///@} } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/include/proton/timestamp.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/timestamp.hpp b/proton-c/bindings/cpp/include/proton/timestamp.hpp index 61d8cf3..af08e40 100644 --- a/proton-c/bindings/cpp/include/proton/timestamp.hpp +++ b/proton-c/bindings/cpp/include/proton/timestamp.hpp @@ -31,7 +31,6 @@ class timestamp : private comparable<timestamp> { explicit timestamp(numeric_type ms = 0) : ms_(ms) {} ///< Construct from milliseconds timestamp& operator=(numeric_type ms) { ms_ = ms; return *this; } ///< Assign from milliseconds numeric_type milliseconds() const { return ms_; } ///< Get milliseconds - numeric_type ms() const { return ms_; } ///< Get milliseconds private: numeric_type ms_; @@ -39,11 +38,11 @@ class timestamp : private comparable<timestamp> { ///@name Comparison and arithmetic operators ///@{ -inline bool operator==(timestamp x, timestamp y) { return x.ms() == y.ms(); } -inline bool operator<(timestamp x, timestamp y) { return x.ms() < y.ms(); } +inline bool operator==(timestamp x, timestamp y) { return x.milliseconds() == y.milliseconds(); } +inline bool operator<(timestamp x, timestamp y) { return x.milliseconds() < y.milliseconds(); } -inline timestamp operator+(timestamp ts, duration d) { return timestamp(ts.ms() + d.ms()); } -inline duration operator-(timestamp t0, timestamp t1) { return duration(t0.ms() - t1.ms()); } +inline timestamp operator+(timestamp ts, duration d) { return timestamp(ts.milliseconds() + d.milliseconds()); } +inline duration operator-(timestamp t0, timestamp t1) { return duration(t0.milliseconds() - t1.milliseconds()); } inline timestamp operator+(duration d, timestamp ts) { return ts + d; } ///@} http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/connection_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/connection_options.cpp b/proton-c/bindings/cpp/src/connection_options.cpp index 19a494a..e655a68 100644 --- a/proton-c/bindings/cpp/src/connection_options.cpp +++ b/proton-c/bindings/cpp/src/connection_options.cpp @@ -111,7 +111,7 @@ class connection_options::impl { if (max_channels.set) pn_transport_set_channel_max(pnt, max_channels.value); if (idle_timeout.set) - pn_transport_set_idle_timeout(pnt, idle_timeout.value.ms()); + pn_transport_set_idle_timeout(pnt, idle_timeout.value.milliseconds()); } // Only apply connection options if uninit. if (uninit) { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/duration.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/duration.cpp b/proton-c/bindings/cpp/src/duration.cpp index 15c3369..9918da1 100644 --- a/proton-c/bindings/cpp/src/duration.cpp +++ b/proton-c/bindings/cpp/src/duration.cpp @@ -31,6 +31,6 @@ const duration duration::IMMEDIATE(0); const duration duration::SECOND(1000); const duration duration::MINUTE(SECOND * 60); -std::ostream& operator<<(std::ostream& o, duration d) { return o << d.ms(); } +std::ostream& operator<<(std::ostream& o, duration d) { return o << d.milliseconds(); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/encoder.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/encoder.cpp b/proton-c/bindings/cpp/src/encoder.cpp index 2952d0e..a228960 100644 --- a/proton-c/bindings/cpp/src/encoder.cpp +++ b/proton-c/bindings/cpp/src/encoder.cpp @@ -130,7 +130,7 @@ encoder& encoder::operator<<(int32_t x) { return insert(x, pn_data_put_int); } encoder& encoder::operator<<(wchar_t x) { return insert(x, pn_data_put_char); } encoder& encoder::operator<<(uint64_t x) { return insert(x, pn_data_put_ulong); } encoder& encoder::operator<<(int64_t x) { return insert(x, pn_data_put_long); } -encoder& encoder::operator<<(timestamp x) { return insert(x.ms(), pn_data_put_timestamp); } +encoder& encoder::operator<<(timestamp x) { return insert(x.milliseconds(), pn_data_put_timestamp); } encoder& encoder::operator<<(float x) { return insert(x, pn_data_put_float); } encoder& encoder::operator<<(double x) { return insert(x, pn_data_put_double); } encoder& encoder::operator<<(decimal32 x) { return insert(x, pn_data_put_decimal32); } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/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 416701d..0f653c6 100644 --- a/proton-c/bindings/cpp/src/message.cpp +++ b/proton-c/bindings/cpp/src/message.cpp @@ -165,14 +165,14 @@ std::string message::content_encoding() const { } void message::expiry_time(timestamp t) { - pn_message_set_expiry_time(pn_msg(), t.ms()); + pn_message_set_expiry_time(pn_msg(), t.milliseconds()); } timestamp message::expiry_time() const { return timestamp(pn_message_get_expiry_time(pn_msg())); } void message::creation_time(timestamp t) { - pn_message_set_creation_time(pn_msg(), t.ms()); + pn_message_set_creation_time(pn_msg(), t.milliseconds()); } timestamp message::creation_time() const { return timestamp(pn_message_get_creation_time(pn_msg())); @@ -304,7 +304,7 @@ bool message::durable() const { return pn_message_is_durable(pn_msg()); } void message::durable(bool b) { pn_message_set_durable(pn_msg(), b); } duration message::ttl() const { return duration(pn_message_get_ttl(pn_msg())); } -void message::ttl(duration d) { pn_message_set_ttl(pn_msg(), d.ms()); } +void message::ttl(duration d) { pn_message_set_ttl(pn_msg(), d.milliseconds()); } uint8_t message::priority() const { return pn_message_get_priority(pn_msg()); } void message::priority(uint8_t d) { pn_message_set_priority(pn_msg(), d); } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/message_test.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/message_test.cpp b/proton-c/bindings/cpp/src/message_test.cpp index d999970..6da7921 100644 --- a/proton-c/bindings/cpp/src/message_test.cpp +++ b/proton-c/bindings/cpp/src/message_test.cpp @@ -54,9 +54,9 @@ void test_message_properties() { CHECK_STR(group_id); CHECK_STR(reply_to_group_id); m.expiry_time(timestamp(42)); - ASSERT_EQUAL(m.expiry_time().ms(), 42); + ASSERT_EQUAL(m.expiry_time().milliseconds(), 42); m.creation_time(timestamp(4242)); - ASSERT_EQUAL(m.creation_time().ms(), 4242); + ASSERT_EQUAL(m.creation_time().milliseconds(), 4242); message m2(m); ASSERT_EQUAL("hello", get<std::string>(m2.body())); @@ -70,8 +70,8 @@ void test_message_properties() { ASSERT_EQUAL("content_encoding", m2.content_encoding()); ASSERT_EQUAL("group_id", m2.group_id()); ASSERT_EQUAL("reply_to_group_id", m2.reply_to_group_id()); - ASSERT_EQUAL(42, m2.expiry_time().ms()); - ASSERT_EQUAL(4242, m.creation_time().ms()); + ASSERT_EQUAL(42, m2.expiry_time().milliseconds()); + ASSERT_EQUAL(4242, m.creation_time().milliseconds()); m2 = m; ASSERT_EQUAL("hello", get<std::string>(m2.body())); @@ -85,8 +85,8 @@ void test_message_properties() { ASSERT_EQUAL("content_encoding", m2.content_encoding()); ASSERT_EQUAL("group_id", m2.group_id()); ASSERT_EQUAL("reply_to_group_id", m2.reply_to_group_id()); - ASSERT_EQUAL(42, m2.expiry_time().ms()); - ASSERT_EQUAL(4242, m.creation_time().ms()); + ASSERT_EQUAL(42, m2.expiry_time().milliseconds()); + ASSERT_EQUAL(4242, m.creation_time().milliseconds()); } void test_message_body() { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/reactor.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/reactor.cpp b/proton-c/bindings/cpp/src/reactor.cpp index c326a7f..9ac3dcc 100644 --- a/proton-c/bindings/cpp/src/reactor.cpp +++ b/proton-c/bindings/cpp/src/reactor.cpp @@ -84,10 +84,10 @@ duration reactor::timeout() { } void reactor::timeout(duration timeout) { - if (timeout == duration::FOREVER || timeout.ms() > PN_MILLIS_MAX) + if (timeout == duration::FOREVER || timeout.milliseconds() > PN_MILLIS_MAX) pn_reactor_set_timeout(pn_object(), PN_MILLIS_MAX); else - pn_reactor_set_timeout(pn_object(), timeout.ms()); + pn_reactor_set_timeout(pn_object(), timeout.milliseconds()); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/reconnect_timer.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/reconnect_timer.cpp b/proton-c/bindings/cpp/src/reconnect_timer.cpp index 04a4a94..68029b8 100644 --- a/proton-c/bindings/cpp/src/reconnect_timer.cpp +++ b/proton-c/bindings/cpp/src/reconnect_timer.cpp @@ -59,7 +59,7 @@ int reconnect_timer::next_delay(timestamp now) { next_delay_ = max_delay_; if (timeout_deadline_ != timestamp(0) && (now + next_delay_ > timeout_deadline_)) next_delay_ = timeout_deadline_ - now; - return next_delay_.ms(); + return next_delay_.milliseconds(); } } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/scalar_base.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/scalar_base.cpp b/proton-c/bindings/cpp/src/scalar_base.cpp index 1220a54..180c40c 100644 --- a/proton-c/bindings/cpp/src/scalar_base.cpp +++ b/proton-c/bindings/cpp/src/scalar_base.cpp @@ -71,7 +71,7 @@ void scalar_base::put_(int64_t x) { atom_.u.as_long = x; atom_.type = PN_LONG; } void scalar_base::put_(wchar_t x) { atom_.u.as_char = x; atom_.type = PN_CHAR; } void scalar_base::put_(float x) { atom_.u.as_float = x; atom_.type = PN_FLOAT; } void scalar_base::put_(double x) { atom_.u.as_double = x; atom_.type = PN_DOUBLE; } -void scalar_base::put_(timestamp x) { atom_.u.as_timestamp = x.ms(); atom_.type = PN_TIMESTAMP; } +void scalar_base::put_(timestamp x) { atom_.u.as_timestamp = x.milliseconds(); atom_.type = PN_TIMESTAMP; } void scalar_base::put_(const decimal32& x) { byte_copy(atom_.u.as_decimal32, x); atom_.type = PN_DECIMAL32;; } void scalar_base::put_(const decimal64& x) { byte_copy(atom_.u.as_decimal64, x); atom_.type = PN_DECIMAL64; } void scalar_base::put_(const decimal128& x) { byte_copy(atom_.u.as_decimal128, x); atom_.type = PN_DECIMAL128; } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ab8a5d82/proton-c/bindings/cpp/src/timestamp.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/timestamp.cpp b/proton-c/bindings/cpp/src/timestamp.cpp index 523b29e..49f1ca0 100644 --- a/proton-c/bindings/cpp/src/timestamp.cpp +++ b/proton-c/bindings/cpp/src/timestamp.cpp @@ -27,6 +27,6 @@ timestamp timestamp::now() { return timestamp(pn_timestamp_now()); } -std::ostream& operator<<(std::ostream& o, timestamp ts) { return o << ts.ms(); } +std::ostream& operator<<(std::ostream& o, timestamp ts) { return o << ts.milliseconds(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
