Some fixes for noexcept specifications

openPMD · Feb 28, 2024 · 4418f46 · 4418f46
1 parent 5ffcd17
commit 4418f46
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/include/openPMD/backend/Attributable.hpp b/include/openPMD/backend/Attributable.hpp
@@ -119,7 +119,7 @@ class Attributable
 
 public:
     Attributable();
-    Attributable(NoInit);
+    Attributable(NoInit) noexcept;
 
     virtual ~Attributable() = default;
 

diff --git a/include/openPMD/backend/Container.hpp b/include/openPMD/backend/Container.hpp
@@ -489,7 +489,7 @@ OPENPMD_protected
         m_containerData = other.m_containerData;
     }
 
-    Container(Container &&other) : Attributable(NoInit())
+    Container(Container &&other) noexcept : Attributable(NoInit())
     {
         if (other.m_attri)
         {
@@ -505,7 +505,7 @@ OPENPMD_protected
         return *this;
     }
 
-    Container &operator=(Container &&other)
+    Container &operator=(Container &&other) noexcept
     {
         if (other.m_attri)
         {

diff --git a/include/openPMD/snapshots/RandomAccessIterator.hpp b/include/openPMD/snapshots/RandomAccessIterator.hpp
@@ -56,10 +56,13 @@ class RandomAccessIterator
     ~RandomAccessIterator() override;
 
     RandomAccessIterator(RandomAccessIterator const &other);
-    RandomAccessIterator(RandomAccessIterator &&other) noexcept;
+    RandomAccessIterator(RandomAccessIterator &&other) noexcept(
+        noexcept(iterator_t(std::declval<iterator_t &&>())));
 
     RandomAccessIterator &operator=(RandomAccessIterator const &other);
-    RandomAccessIterator &operator=(RandomAccessIterator &&other) noexcept;
+    RandomAccessIterator &
+    operator=(RandomAccessIterator &&other) noexcept(noexcept(
+        std::declval<iterator_t>().operator=(std::declval<iterator_t &&>())));
 
     value_type const &operator*() const;
     RandomAccessIterator &operator++();

diff --git a/src/backend/Attributable.cpp b/src/backend/Attributable.cpp
@@ -48,7 +48,7 @@ Attributable::Attributable()
     }
 }
 
-Attributable::Attributable(NoInit)
+Attributable::Attributable(NoInit) noexcept
 {}
 
 Attribute Attributable::getAttribute(std::string const &key) const

diff --git a/src/snapshots/RandomAccessIterator.cpp b/src/snapshots/RandomAccessIterator.cpp
@@ -14,13 +14,18 @@ RandomAccessIterator<iterator_t>::RandomAccessIterator(
     RandomAccessIterator const &other) = default;
 template <typename iterator_t>
 RandomAccessIterator<iterator_t>::RandomAccessIterator(
-    RandomAccessIterator &&other) noexcept = default;
+    RandomAccessIterator
+        &&other) noexcept(noexcept(iterator_t(std::declval<iterator_t &&>()))) =
+    default;
 template <typename iterator_t>
 RandomAccessIterator<iterator_t> &RandomAccessIterator<iterator_t>::operator=(
     RandomAccessIterator const &other) = default;
 template <typename iterator_t>
 RandomAccessIterator<iterator_t> &RandomAccessIterator<iterator_t>::operator=(
-    RandomAccessIterator &&other) noexcept = default;
+    RandomAccessIterator
+        &&other) noexcept(noexcept(std::declval<iterator_t>().
+                                   operator=(std::declval<iterator_t &&>()))) =
+    default;
 
 template <typename iterator_t>
 auto RandomAccessIterator<iterator_t>::operator*() const -> value_type const &