travis: fix clang

[awesomized/libmemcached] / testing / lib / MemcachedCluster.hpp

diff --git a/testing/lib/MemcachedCluster.hpp b/testing/lib/MemcachedCluster.hpp
index 7286e69f9424c0141e549dcdac815347e5e45c09..ee2dfdd2fa91f4ffbd69c1e74542c40fe9a93f7f 100644 (file)
--- a/testing/lib/MemcachedCluster.hpp
+++ b/testing/lib/MemcachedCluster.hpp
@@ -2,38 +2,8 @@
 
 #include "common.hpp"
 #include "Cluster.hpp"
+#include "ReturnMatcher.hpp"
 
-class ReturnMatcher : public Catch::MatcherBase<memcached_return_t> {
-public:
-  explicit ReturnMatcher(const memcached_st *memc_, memcached_return_t expected_ = MEMCACHED_SUCCESS)
-      : memc{memc_}
-      , expected{expected_}
-  {}
-
-  ReturnMatcher(const ReturnMatcher &) = default;
-  ReturnMatcher &operator = (const ReturnMatcher &) = default;
-
-  ReturnMatcher(ReturnMatcher &&rm);
-  ReturnMatcher &operator = (ReturnMatcher &&rm);
-
-  bool match(const memcached_return_t &arg) const override;
-  ReturnMatcher success();
-  ReturnMatcher operator () (memcached_return_t expected_);
-
-protected:
-  string describe() const override;
-
-private:
-  const memcached_st *memc;
-  memcached_return_t expected{MEMCACHED_SUCCESS};
-};
-
-class LoneReturnMatcher {
-public:
-  ReturnMatcher returns;
-  explicit LoneReturnMatcher(const memcached_st *memc) : returns{memc}
-  {}
-};
 
 class MemcachedCluster {
 public:
@@ -53,6 +23,8 @@ public:
   MemcachedCluster &operator=(MemcachedCluster &&mc);
 
   void enableBinaryProto(bool enable = true);
+  void enableBuffering(bool enable = true);
+  void enableReplication();
   void flush();
 
   static MemcachedCluster mixed();