Changeset 2106 for trunk/source/container_classes.h

Timestamp:

06/10/08 16:39:31 (7 months ago)

Author:

rjrw

Message:

Remove another unnecessary template parameter.

Include (and use) STATIC_ASSERT for checking compile-time consistency.

Files:

• trunk/source/container_classes.h (modified) (8 diffs)

trunk/source/container_classes.h

@@ -275 +275 @@
 //! multi_geom - this class maintains all the geometry information for multi_arr
 //! keeping it separate makes it easy to clone the information from one multi_arr to another
-template<int d,mem_layout ALLOC=MEM_LAYOUT_VAL,bool lgBC=lgBOUNDSCHECKVAL>
+template<int d,mem_layout ALLOC=MEM_LAYOUT_VAL>
 class multi_geom
 {
@@ -382 +382 @@
 #       pragma warning( disable : 4127 )
 #endif
+
+                STATIC_ASSERT ( ALLOC == C_TYPE || ALLOC == ARPA_TYPE );
+
                 if( ALLOC == ARPA_TYPE )
                 {
@@ -403 +406 @@
                 {
                         TotalInsanity();
-                }               
+                }
         }
 
@@ -902 +905 @@
 {
         // ancillary data describing the memory layout of the multi_arr
-        multi_geom<d,ALLOC,lgBC> p_g;
+        multi_geom<d,ALLOC> p_g;
         T** p_psl[d-1];     // pointer arrays for ARPA structure
         valarray<T> p_dsl;  // this contains the actual data
@@ -951 +954 @@
                 p_clear1();
         }
-        multi_arr(const multi_geom<d,ALLOC,lgBC>& g)
+        multi_arr(const multi_geom<d,ALLOC>& g)
         {
                 p_clear1();
@@ -1026 +1029 @@
 #       pragma warning( disable : 4127 )
 #endif
+                STATIC_ASSERT ( ALLOC == C_TYPE || ALLOC == ARPA_TYPE );
+
                 if( ALLOC == ARPA_TYPE )
                 {
@@ -1064 +1069 @@
         }
         // clone the geometry from another multi_arr
-        void alloc(const multi_geom<d,ALLOC,lgBC>& g)
+        void alloc(const multi_geom<d,ALLOC>& g)
         {
                 if( &g != &p_g )
@@ -1647 +1652 @@
         }
 
-        const multi_geom<d,ALLOC,lgBC>& clone() const
+        const multi_geom<d,ALLOC>& clone() const
         {
                 return p_g;