Merge remote-tracking branch 'couchbase/3.1.3' into 'couchbase/3.0.x' 19/57619/1
authorDave Rigby <daver@couchbase.com>
Wed, 9 Dec 2015 10:12:25 +0000 (10:12 +0000)
committerDave Rigby <daver@couchbase.com>
Wed, 9 Dec 2015 10:12:25 +0000 (10:12 +0000)
* couchbase/3.1.3:
  Fix compilation issue on windows
  [BP] MB-16915: Remove cyclic reference between DcpConsumer and PassiveStream.
  [BP] MB-16915: RollbackTask to hold ref count ptr for DCP consumer instead of raw ptr
  [BP] MB-16915: Use refcounted pointers on producer/consumer

Change-Id: Ied8b262fef0eb06671277524e17f0b6cbf7acbeb

1  2 
tests/ep_testsuite.cc

@@@ -4965,7 -4954,7 +4965,7 @@@ static enum test_result test_dcp_close_
            "Expected success");
  
      state = get_str_stat(h, h1, "eq_dcpq:unittest:stream_0_state", "dcp");
-     checkeq(static_cast<unsigned long>(0), state.length(),
 -    checkeq(0, static_cast<int>(state.length()),
++    checkeq(size_t(0), state.length(),
              "Did not expect to find the closed stream");
  
      testHarness.destroy_cookie(cookie);