[lmi-commits] [lmi] master 1f1adcf 8/9: Prefer std::array to std::vector when size is fixed

[Greg Chicares]

branch: master
commit 1f1adcfce7f982e72c3c4d0333ca650ce91baf2d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Prefer std::array to std::vector when size is fixed
---
 dbindex.hpp | 8 ++++----
 dbvalue.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dbindex.hpp b/dbindex.hpp
index fde8c39..3ad5d11 100644
--- a/dbindex.hpp
+++ b/dbindex.hpp
@@ -27,7 +27,7 @@
 #include "assert_lmi.hpp"
 #include "mc_enum_type_enums.hpp"
 
-#include <vector>
+#include <array>
 
 /// Number of database axes, excluding the special duration axis.
 
@@ -82,7 +82,7 @@ class database_index
         check_issue_age();
     }
 
-    std::vector<int> const& index_vector() const {return idx_;}
+    std::array<int,number_of_indices> const& index_array() const {return idx_;}
 
     mcenum_gender   gender   () const {return static_cast<mcenum_gender  
>(idx_[0]);}
     mcenum_class    uw_class () const {return static_cast<mcenum_class   
>(idx_[1]);}
@@ -99,7 +99,7 @@ class database_index
     database_index state    (mcenum_state    z) const {auto i = idx_; i[5] = 
z; return {i};}
 
   private:
-    database_index(std::vector<int> idx)
+    database_index(std::array<int,number_of_indices> idx)
         :idx_ {idx}
     {
         check_issue_age();
@@ -110,7 +110,7 @@ class database_index
         LMI_ASSERT(0 <= issue_age() && issue_age() < e_max_dim_issue_age);
     }
 
-    std::vector<int> const idx_;
+    std::array<int,number_of_indices> const idx_;
 };
 
 #endif // dbindex_hpp
diff --git a/dbvalue.cpp b/dbvalue.cpp
index 60603f7..39ee57d 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -277,7 +277,7 @@ double& database_entity::operator[](std::vector<int> const& 
index)
 
 double const* database_entity::operator[](database_index const& idx) const
 {
-    std::vector<int> const& index(idx.index_vector());
+    auto const& index(idx.index_array());
     LMI_ASSERT(e_number_of_axes == 1 + index.size());
 
     int z = 0;