Mercurial > octave

diff liboctave/util/action-container.h @ 31635:7d3467f8d713 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset d9970470108a
author John W. Eaton <jwe@octave.org>
date Sat, 03 Dec 2022 14:43:33 -0500
parents d9970470108a
children 597f3ee61a48
line wrap: on
line diff
--- a/liboctave/util/action-container.h	Sat Dec 03 10:36:59 2022 -0500
+++ b/liboctave/util/action-container.h	Sat Dec 03 14:43:33 2022 -0500
@@ -28,7 +28,6 @@
 
 #include "octave-config.h"
 
-#include <atomic>
 #include <cstddef>
 #include <functional>
 
@@ -40,22 +39,6 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-OCTAVE_BEGIN_NAMESPACE(util)
-
-template <typename T>
-struct atomic_traits
-{
-  typedef T type;
-};
-
-template <typename T>
-struct atomic_traits<std::atomic<T>>
-{
-  typedef T type;
-};
-
-OCTAVE_END_NAMESPACE(util)
-
 class
 action_container
 {
@@ -123,8 +106,7 @@
 
   private:
 
-    T *m_ptr;
-    typename util::atomic_traits<T>::type m_val;
+    T *m_ptr, m_val;
   };
 
   // Deletes a class allocated using new.