Changeset 1910

Timestamp:

04/02/08 12:21:50 (8 months ago)

Author:

peter

Message:

source/container_classes.h:

Another rewrite of INSTANTIATE_MULTI_ARR with the following goals:

• Make the instantiation extern on all platforms that support it. This avoids code bloat.
  
• Only instantiate methods that are useful in the debugging process.
  

Files:

• trunk/source/container_classes.h (modified) (1 diff)

trunk/source/container_classes.h

@@ -1707 +1707 @@
 typedef multi_arr<double,6>::const_iterator md6ci;
 
-#if defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__)
-#define MAC_EXTERN EXTERN
+#if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(_MSC_VER) || defined(__PGI)
+#define INST_EXTERN EXTERN
 #else
-#define MAC_EXTERN
-#endif
-
-// on Mac these instantiations need to be extern in order to avoid duplicate symbols
-// but MS Visual Studio rejects the extern declaration as a syntax error....
+#define INST_EXTERN
+#endif
+
+// on Mac systems these instantiations need to be extern in order to avoid duplicate symbols
 #define INSTANTIATE_MULTI_ARR( TYPE, LAYOUT, BC ) \
-MAC_EXTERN template TYPE& n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const n_pointer<TYPE,1,LAYOUT,BC> n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const n_pointer<TYPE,2,LAYOUT,BC> n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const n_pointer<TYPE,3,LAYOUT,BC> n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const n_pointer<TYPE,4,LAYOUT,BC> n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t); \
-MAC_EXTERN template const n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t); \
-MAC_EXTERN template const n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t); \
-MAC_EXTERN template const n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t); \
-MAC_EXTERN template const n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t); \
-MAC_EXTERN template const TYPE& const_n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,1,LAYOUT,BC> const_n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,2,LAYOUT,BC> const_n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,3,LAYOUT,BC> const_n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,4,LAYOUT,BC> const_n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template const const_n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t) const; \
-MAC_EXTERN template TYPE& basic_pntr<TYPE,2,LAYOUT,BC>::operator* () const; \
-MAC_EXTERN template TYPE& basic_pntr<TYPE,3,LAYOUT,BC>::operator* () const; \
-MAC_EXTERN template TYPE& basic_pntr<TYPE,4,LAYOUT,BC>::operator* () const; \
-MAC_EXTERN template TYPE& basic_pntr<TYPE,5,LAYOUT,BC>::operator* () const; \
-MAC_EXTERN template TYPE& basic_pntr<TYPE,6,LAYOUT,BC>::operator* () const
+INST_EXTERN template class pntr<TYPE,2,LAYOUT,BC>; \
+INST_EXTERN template class pntr<TYPE,3,LAYOUT,BC>; \
+INST_EXTERN template class pntr<TYPE,4,LAYOUT,BC>; \
+INST_EXTERN template class pntr<TYPE,5,LAYOUT,BC>; \
+INST_EXTERN template class pntr<TYPE,6,LAYOUT,BC>; \
+INST_EXTERN template class const_pntr<TYPE,2,LAYOUT,BC>; \
+INST_EXTERN template class const_pntr<TYPE,3,LAYOUT,BC>; \
+INST_EXTERN template class const_pntr<TYPE,4,LAYOUT,BC>; \
+INST_EXTERN template class const_pntr<TYPE,5,LAYOUT,BC>; \
+INST_EXTERN template class const_pntr<TYPE,6,LAYOUT,BC>
 
 INSTANTIATE_MULTI_ARR( bool, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL );