Merge branch 'master' into cmake_love

TartanLlama · Jun 25, 2019 · 1d4e6f4 · 1d4e6f4
2 parents fb92d2d + b87a35a
commit 1d4e6f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/include/tl/function_ref.hpp b/include/tl/function_ref.hpp
@@ -161,11 +161,7 @@ template <class R, class... Args> class function_ref<R(Args...)> {
 
   /// Makes `*this` refer to the same callable as `rhs`.
   TL_FUNCTION_REF_11_CONSTEXPR function_ref<R(Args...)> &
-  operator=(const function_ref<R(Args...)> &rhs) noexcept {
-    obj_ = rhs.obj_;
-    callback_ = rhs.callback_;
-    return *this;
-  }
+  operator=(const function_ref<R(Args...)> &rhs) noexcept = default;
 
   /// Makes `*this` refer to `f`.
   ///

diff --git a/tests/issues.cpp b/tests/issues.cpp
@@ -18,7 +18,7 @@ tl::function_ref<Fruit* ()> bar()
 }
 
 TEST_CASE("Issue #9") {
-  bar()();
+  bar();
 }
 
 void foo(const tl::function_ref<int(const std::vector<int>)>& func) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ tl::function_ref<Fruit* ()> bar() @@
     }
     TEST_CASE("Issue #9") {
-      bar()();
+      bar();
     }
     void foo(const tl::function_ref<int(const std::vector<int>)>& func) {
@@ Expand Down @@