From commits-return-2531-apmail-rocketmq-commits-archive=rocketmq.apache.org@rocketmq.apache.org Wed Nov 28 09:55:41 2018 Return-Path: X-Original-To: apmail-rocketmq-commits-archive@minotaur.apache.org Delivered-To: apmail-rocketmq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EB50D18FF6 for ; Wed, 28 Nov 2018 09:55:41 +0000 (UTC) Received: (qmail 32750 invoked by uid 500); 28 Nov 2018 09:55:41 -0000 Delivered-To: apmail-rocketmq-commits-archive@rocketmq.apache.org Received: (qmail 32714 invoked by uid 500); 28 Nov 2018 09:55:41 -0000 Mailing-List: contact commits-help@rocketmq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@rocketmq.apache.org Delivered-To: mailing list commits@rocketmq.apache.org Received: (qmail 32705 invoked by uid 99); 28 Nov 2018 09:55:41 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2018 09:55:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 06F7280879; Wed, 28 Nov 2018 09:55:41 +0000 (UTC) Date: Wed, 28 Nov 2018 09:55:41 +0000 To: "commits@rocketmq.apache.org" Subject: [rocketmq-client-cpp] 01/01: Merge pull request #16 from wenfengwang/master MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: vongosling@apache.org In-Reply-To: <154339894096.5805.6879331956489285493@gitbox.apache.org> References: <154339894096.5805.6879331956489285493@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: rocketmq-client-cpp X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 3f68840f5a7705551cc36260e444b9606c46311c X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181128095541.06F7280879@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. vongosling pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-client-cpp.git commit 3f68840f5a7705551cc36260e444b9606c46311c Merge: 358dc61 e1dfd27 Author: von gosling AuthorDate: Wed Nov 28 17:55:36 2018 +0800 Merge pull request #16 from wenfengwang/master Fix compile errors on macOS .gitignore | 2 ++ CMakeLists.txt | 4 +++- src/consumer/ConsumeMessageConcurrentlyService.cpp | 6 +++--- src/consumer/ConsumeMessageOrderlyService.cpp | 6 +++--- src/thread/task_queue.cpp | 6 +++--- src/transport/TcpRemotingClient.cpp | 6 +++--- 6 files changed, 17 insertions(+), 13 deletions(-)