Fix destruction order problem in getCoreAllocator

[folly.git] / folly / experimental / AtomicSharedPtr.h

diff --git a/folly/experimental/AtomicSharedPtr.h b/folly/experimental/AtomicSharedPtr.h
index ad1f7d3df84c89307dfb4b5189502e569eea9579..6e4ef54a36eab5f2649adab5e6fac68f29f27fa3 100644 (file)
--- a/folly/experimental/AtomicSharedPtr.h
+++ b/folly/experimental/AtomicSharedPtr.h
@@ -106,11 +106,9 @@ class atomic_shared_ptr {
   SharedPtr load(std::memory_order order = std::memory_order_seq_cst) const
       noexcept {
     auto local = takeOwnedBase(order);
-
-    auto res = get_shared_ptr(local, false);
-
-    return std::move(res);
+    return get_shared_ptr(local, false);
   }
+
   /* implicit */ operator SharedPtr() const {
     return load();
   }
@@ -332,7 +330,7 @@ class atomic_shared_ptr {
               p.get());
       res = *aliasedp;
     }
-    return std::move(res);
+    return res;
   }
 
   /* Get a reference to the pointer, either from the local batch or