[core] FixedArray: use a function to throw an exception.

Haivision · Apr 20, 2022 · c0da44e · c0da44e
1 parent 29d56be
commit c0da44e
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/srtcore/utilities.h b/srtcore/utilities.h
@@ -418,8 +418,7 @@ class FixedArray
 {
 public:
     FixedArray(size_t size)
-        : m_strIndexErr("FixedArray: invalid index")
-        , m_size(size)
+        : m_size(size)
         , m_entries(new T[size])
     {
     }
@@ -433,31 +432,31 @@ class FixedArray
     const T& operator[](size_t index) const
     {
         if (index >= m_size)
-            throw std::runtime_error(m_strIndexErr);
+            raise_expection(index);
 
         return m_entries[index];
     }
 
     T& operator[](size_t index)
     {
         if (index >= m_size)
-            throw std::runtime_error(m_strIndexErr);
+            raise_expection(index);
 
         return m_entries[index];
     }
 
     const T& operator[](int index) const
     {
         if (index < 0 || static_cast<size_t>(index) >= m_size)
-            throw std::runtime_error(m_strIndexErr);
+            raise_expection(index);
 
         return m_entries[index];
     }
 
     T& operator[](int index)
     {
         if (index < 0 || static_cast<size_t>(index) >= m_size)
-            throw std::runtime_error(m_strIndexErr);
+            raise_expection(index);
 
         return m_entries[index];
     }
@@ -479,8 +478,14 @@ class FixedArray
     FixedArray(const FixedArray<T>& );
     FixedArray<T>& operator=(const FixedArray<T>&);
 
+    void raise_expection(int i) const
+    {
+        std::stringstream ss;
+        ss << "Index " << i << "out of range";
+        throw std::runtime_error(ss.str());
+    }
+
 private:
-    const char* m_strIndexErr;
     size_t      m_size;
     T* const    m_entries;
 };