[rocketmq-client-cpp] 01/01: Merge pull request #53 from ShannonDing/format

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duhengforever pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-cpp.git

commit 2a06e0f5ee2b2830ac39fc0a33aade34319c7301
Merge: 4a83991 cc89f2b
Author: Heng Du <du...@gmail.com>
AuthorDate: Mon Jan 7 10:46:45 2019 +0800

    Merge pull request #53 from ShannonDing/format
    
    [ISSUE #45]Fix unsafe code ,build warnings and format code style

 CMakeLists.txt                         |    2 +
 include/DefaultMQProducer.h            |    2 +-
 src/common/sync_http_client.h          |    2 +-
 src/consumer/DefaultMQPullConsumer.cpp |    3 +-
 src/consumer/DefaultMQPushConsumer.cpp | 1909 ++++++++++++++++----------------
 src/consumer/PullRequest.h             |    2 +-
 src/producer/DefaultMQProducer.cpp     |    5 +-
 src/thread/disruptor/sequence.h        |    8 +-
 src/transport/TcpTransport.cpp         |    8 +-
 9 files changed, 981 insertions(+), 960 deletions(-)

diff --cc include/DefaultMQProducer.h
index 25799b6,b3ba2b2..02f5651
--- a/include/DefaultMQProducer.h
+++ b/include/DefaultMQProducer.h
@@@ -100,10 -97,9 +100,10 @@@ class ROCKETMQCLIENT_API DefaultMQProdu
    int m_sendMsgTimeout;
    int m_compressMsgBodyOverHowmuch;
    int m_maxMessageSize;  //<! default:128K;
-   bool m_retryAnotherBrokerWhenNotStoreOK;
+   //bool m_retryAnotherBrokerWhenNotStoreOK;
    int m_compressLevel;
    int m_retryTimes;
 +  int m_retryTimes4Async;  
  };
  //<!***************************************************************************
  }  //<!end namespace;
diff --cc src/producer/DefaultMQProducer.cpp
index 748ffca,f0b53cf..4edf811
--- a/src/producer/DefaultMQProducer.cpp
+++ b/src/producer/DefaultMQProducer.cpp
@@@ -37,10 -37,9 +37,10 @@@ DefaultMQProducer::DefaultMQProducer(co
      : m_sendMsgTimeout(3000),
        m_compressMsgBodyOverHowmuch(4 * 1024),
        m_maxMessageSize(1024 * 128),
-       m_retryAnotherBrokerWhenNotStoreOK(false),
+       //m_retryAnotherBrokerWhenNotStoreOK(false),
        m_compressLevel(5),
 -      m_retryTimes(5) {
 +      m_retryTimes(5),
 +      m_retryTimes4Async(1) {
    //<!set default group name;
    string gname = groupname.empty() ? DEFAULT_PRODUCER_GROUP : groupname;
    setGroupName(gname);