Use static constexpr in class

CleverRaven · Feb 10, 2020 · bb27d5a · bb27d5a
1 parent a0f97cd
commit bb27d5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/submap.cpp b/src/submap.cpp
@@ -35,8 +35,6 @@ void maptile_soa<sx, sy>::swap_soa_tile( const point &p, maptile_soa<1, 1> &othe
 
 submap::submap()
 {
-    constexpr size_t elements = SEEX * SEEY;
-
     std::uninitialized_fill_n( &ter[0][0], elements, t_null );
     std::uninitialized_fill_n( &frn[0][0], elements, f_null );
     std::uninitialized_fill_n( &lum[0][0], elements, 0 );

diff --git a/src/submap.h b/src/submap.h
@@ -74,8 +74,7 @@ class submap : maptile_soa<SEEX, SEEY>
         }
 
         void set_all_traps( const trap_id &trap ) {
-            constexpr size_t block_size = SEEX * SEEY;
-            std::uninitialized_fill_n( &trp[0][0], block_size, trap );
+            std::uninitialized_fill_n( &trp[0][0], elements, trap );
         }
 
         furn_id get_furn( const point &p ) const {
@@ -88,8 +87,7 @@ class submap : maptile_soa<SEEX, SEEY>
         }
 
         void set_all_furn( const furn_id &furn ) {
-            constexpr size_t block_size = SEEX * SEEY;
-            std::uninitialized_fill_n( &frn[0][0], block_size, furn );
+            std::uninitialized_fill_n( &frn[0][0], elements, furn );
         }
 
         ter_id get_ter( const point &p ) const {
@@ -102,8 +100,7 @@ class submap : maptile_soa<SEEX, SEEY>
         }
 
         void set_all_ter( const ter_id &terr ) {
-            constexpr size_t block_size = SEEX * SEEY;
-            std::uninitialized_fill_n( &ter[0][0], block_size, terr );
+            std::uninitialized_fill_n( &ter[0][0], elements, terr );
         }
 
         int get_radiation( const point &p ) const {
@@ -251,6 +248,8 @@ class submap : maptile_soa<SEEX, SEEY>
         int temperature = 0;
 
         void update_legacy_computer();
+
+        static constexpr size_t elements = SEEX * SEEY;
 };
 
 /**