X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=testing%2Flib%2FMemcachedCluster.cpp;h=6473614908a66a2c15a259ca1630f05cc3408897;hb=e7f51c073a098b790b442c680cbee712a5dc2fef;hp=9da89a960075b13b9df86397b062e4b08719506d;hpb=d1c9b695e9b3fbfcc94230a242b0290b43f27006;p=m6w6%2Flibmemcached

diff --git a/testing/lib/MemcachedCluster.cpp b/testing/lib/MemcachedCluster.cpp
index 9da89a96..64736149 100644
--- a/testing/lib/MemcachedCluster.cpp
+++ b/testing/lib/MemcachedCluster.cpp
@@ -42,7 +42,7 @@ MemcachedCluster::MemcachedCluster()
 }
 
 MemcachedCluster::MemcachedCluster(Cluster &&cluster_)
-: cluster{forward<Cluster>(cluster_)}
+: cluster{move(cluster_)}
 {
   init();
 }
@@ -82,30 +82,3 @@ MemcachedCluster &MemcachedCluster::operator=(MemcachedCluster &&mc) {
   returns = ReturnMatcher{&memc};
   return *this;
 }
-
-ReturnMatcher &ReturnMatcher::operator=(ReturnMatcher &&rm) {
-  memc = exchange(rm.memc, nullptr);
-  expected = rm.expected;
-  return *this;
-}
-
-bool ReturnMatcher::match(const memcached_return_t &arg) const {
-  return arg == expected;
-}
-
-ReturnMatcher ReturnMatcher::success() {
-  return ReturnMatcher{memc};
-}
-
-ReturnMatcher ReturnMatcher::operator()(memcached_return_t expected_) {
-  return ReturnMatcher{memc, expected_};
-}
-
-string ReturnMatcher::describe() const {
-  return "is " + to_string(expected)
-         + "\n  actual: " + memcached_last_error_message(memc);
-}
-
-ReturnMatcher::ReturnMatcher(ReturnMatcher &&rm) {
-  *this = move(rm);
-}