rocket/*: Try evading explicit instantiation issues in GCC 7

lhmouse · Feb 25, 2024 · 0271fac · 0271fac
1 parent a677a8d
commit 0271fac
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/rocket/cow_hashmap.hpp b/rocket/cow_hashmap.hpp
@@ -75,6 +75,7 @@ class cow_hashmap
 
   public:
     // 26.5.4.2, construct/copy/destroy
+    ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
     constexpr cow_hashmap()
       noexcept(conjunction<is_nothrow_constructible<allocator_type>,
                            is_nothrow_constructible<hasher>,

diff --git a/rocket/cow_vector.hpp b/rocket/cow_vector.hpp
@@ -55,6 +55,7 @@ class cow_vector
 
   public:
     // 26.3.11.2, construct/copy/destroy
+    ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
     constexpr cow_vector() noexcept(is_nothrow_constructible<allocator_type>::value)
       :
         m_sth()

diff --git a/rocket/refcnt_ptr.hpp b/rocket/refcnt_ptr.hpp
@@ -111,6 +111,7 @@ class refcnt_ptr
     details_refcnt_ptr::stored_pointer<element_type> m_sth;
 
   public:
+    ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
     constexpr refcnt_ptr(nullptr_t = nullptr) noexcept
       :
         m_sth()

diff --git a/rocket/static_vector.hpp b/rocket/static_vector.hpp
@@ -51,7 +51,8 @@ class static_vector
 
   public:
     // 26.3.11.2, construct/copy/destroy
-    static_vector() noexcept(is_nothrow_constructible<allocator_type>::value)
+    ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
+    constexpr static_vector() noexcept(is_nothrow_constructible<allocator_type>::value)
       :
         m_sth()
       { }

diff --git a/rocket/unique_ptr.hpp b/rocket/unique_ptr.hpp
@@ -35,6 +35,7 @@ class unique_ptr
 
   public:
     // 23.11.1.2.1, constructors
+    ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
     constexpr unique_ptr(nullptr_t = nullptr) noexcept(is_nothrow_constructible<deleter_type>::value)
       :
         m_sth()
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ class cow_vector @@
       public:
         // 26.3.11.2, construct/copy/destroy
+        ROCKET_ALWAYS_INLINE  // https://gcc.gnu.org/PR109464
         constexpr cow_vector() noexcept(is_nothrow_constructible<allocator_type>::value)
           :
             m_sth()
@@ Expand Down @@