This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit e959f09291021a5916fcf77345113d97f3580274 Author: Matteo Merli <[email protected]> AuthorDate: Tue Jun 26 12:46:22 2018 -0700 Added integer types casting to avoid compile errors with gcc-4.8 (#2031) --- pulsar-client-go/pulsar/c_consumer.go | 2 +- pulsar-client-go/pulsar/c_message.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pulsar-client-go/pulsar/c_consumer.go b/pulsar-client-go/pulsar/c_consumer.go index abbe0f1..aebabc8 100644 --- a/pulsar-client-go/pulsar/c_consumer.go +++ b/pulsar-client-go/pulsar/c_consumer.go @@ -92,7 +92,7 @@ func subscribeAsync(client *client, options ConsumerOptions, callback func(Consu if options.AckTimeout != 0 { timeoutMillis := options.AckTimeout.Nanoseconds() / int64(time.Millisecond) - C.pulsar_consumer_set_unacked_messages_timeout_ms(conf, C.ulonglong(timeoutMillis)) + C.pulsar_consumer_set_unacked_messages_timeout_ms(conf, C.uint64_t(timeoutMillis)) } if options.Type != Exclusive { diff --git a/pulsar-client-go/pulsar/c_message.go b/pulsar-client-go/pulsar/c_message.go index 4f391ad..3db1e0b 100644 --- a/pulsar-client-go/pulsar/c_message.go +++ b/pulsar-client-go/pulsar/c_message.go @@ -52,7 +52,7 @@ func buildMessage(message ProducerMessage) *C.pulsar_message_t { } if message.Payload != nil { - C.pulsar_message_set_content(cMsg, unsafe.Pointer(&message.Payload[0]), C.ulong(len(message.Payload))) + C.pulsar_message_set_content(cMsg, unsafe.Pointer(&message.Payload[0]), C.size_t(len(message.Payload))) } if message.Properties != nil { @@ -68,7 +68,7 @@ func buildMessage(message ProducerMessage) *C.pulsar_message_t { } if message.EventTime.UnixNano() != 0 { - C.pulsar_message_set_event_timestamp(cMsg, timeToUnixTimestampMillis(message.EventTime)) + C.pulsar_message_set_event_timestamp(cMsg, C.uint64_t(timeToUnixTimestampMillis(message.EventTime))) } if message.ReplicationClusters != nil { @@ -134,7 +134,7 @@ func (m *message) ID() MessageID { } func (m *message) PublishTime() time.Time { - return timeFromUnixTimestampMillis(C.pulsar_message_get_publish_timestamp(m.ptr)) + return timeFromUnixTimestampMillis(C.ulonglong(C.pulsar_message_get_publish_timestamp(m.ptr))) } func (m *message) EventTime() *time.Time { @@ -142,7 +142,7 @@ func (m *message) EventTime() *time.Time { if uint64(eventTime) == 0 { return nil } else { - res := timeFromUnixTimestampMillis(eventTime) + res := timeFromUnixTimestampMillis(C.ulonglong(eventTime)) return &res } } @@ -171,7 +171,7 @@ func (m *messageID) Serialize() []byte { } func deserializeMessageId(data []byte) MessageID { - msgId := &messageID{ptr: C.pulsar_message_id_deserialize(unsafe.Pointer(&data[0]), C.uint(len(data)))} + msgId := &messageID{ptr: C.pulsar_message_id_deserialize(unsafe.Pointer(&data[0]), C.uint32_t(len(data)))} runtime.SetFinalizer(msgId, messageIdFinalizer) return msgId }
