fix #95

[m6w6/libmemcached] / test / lib / ReturnMatcher.hpp

diff --git a/test/lib/ReturnMatcher.hpp b/test/lib/ReturnMatcher.hpp
index 81c2d4813a8146b8c123aa300dfe957ac8503189..f95eb2f3ecae9c03324cea0c08e8fa5c86cf11c1 100644 (file)
--- a/test/lib/ReturnMatcher.hpp
+++ b/test/lib/ReturnMatcher.hpp
@@ -1,35 +1,47 @@
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - C/C++ Client Library for memcached                  |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    +--------------------------------------------------------------------+
+*/
+
 #pragma once
 
 #include "test/lib/common.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_}
-  {}
+  explicit ReturnMatcher(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_);
+  ReturnMatcher operator()(memcached_return_t expected_);
+  ReturnMatcher &operator=(memcached_st *memc_);
 
 protected:
   string describe() const override;
 
 private:
-  const memcached_st *memc;
+  memcached_st *memc;
   memcached_return_t expected{MEMCACHED_SUCCESS};
 };
 
 class LoneReturnMatcher {
 public:
   ReturnMatcher returns;
-  explicit LoneReturnMatcher(const memcached_st *memc) : returns{memc}
-  {}
+  explicit LoneReturnMatcher(memcached_st *memc)
+  : returns{memc} {}
 };