From: Daniel Arndt <arndtd@ornl.gov>
Date: Tue, 28 Nov 2023 22:58:45 +0000 (-0500)
Subject: Merge pull request #16295 from bangerth/lazy
X-Git-Tag: relicensing~276
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f973201c2fa5116f2a931f2598c85e859e6389b;p=dealii.git

Merge pull request #16295 from bangerth/lazy
---

3f973201c2fa5116f2a931f2598c85e859e6389b
diff --cc include/deal.II/base/lazy.h
index dbc01eeed9,b3774f3bbe..84975826a1
--- a/include/deal.II/base/lazy.h
+++ b/include/deal.II/base/lazy.h
@@@ -264,12 -269,18 +278,20 @@@ inline Lazy<T>::Lazy(const Lazy &other
  
  
  template <typename T>
 +DEAL_II_CXX20_REQUIRES((std::is_move_constructible_v<T> &&
 +                        std::is_move_assignable_v<T>))
  inline Lazy<T>::Lazy(Lazy &&other) noexcept
-   : object(other.object)
+   : object(std::move(other.object))
  {
    object_is_initialized.store(other.object_is_initialized.load());
+ 
+   // Mark the other object as uninitialized. This is marginally non-trivial
+   // because moving from std::optional<T> does *not* result in an empty
+   // std::optional<T> but instead one that does contain a T, but one that
+   // has been moved from -- typically something akin to a default-initialized
+   // T. That seems undesirable, so reset everything to an empty state.
+   other.object_is_initialized.store(false);
+   other.object.reset();
  }
  
  
@@@ -285,12 -295,20 +307,21 @@@ inline Lazy<T> &Lazy<T>::operator=(cons
  
  
  template <typename T>
 -inline Lazy<T> &
 -Lazy<T>::operator=(Lazy &&other) noexcept
 +DEAL_II_CXX20_REQUIRES((std::is_move_constructible_v<T> &&
 +                        std::is_move_assignable_v<T>))
 +inline Lazy<T> &Lazy<T>::operator=(Lazy &&other) noexcept
  {
-   object = other.object;
+   object = std::move(other.object);
    object_is_initialized.store(other.object_is_initialized.load());
+ 
+   // Mark the other object as uninitialized. This is marginally non-trivial
+   // because moving from std::optional<T> does *not* result in an empty
+   // std::optional<T> but instead one that does contain a T, but one that
+   // has been moved from -- typically something akin to a default-initialized
+   // T. That seems undesirable, so reset everything to an empty state.
+   other.object_is_initialized.store(false);
+   other.object.reset();
+ 
    return *this;
  }