Changeset 1899

Show
Ignore:
Timestamp:
03/30/08 16:52:04 (8 months ago)
Author:
peter
Message:

source/cddefines.h:
source/container_classes.h:
source/iso_create.cpp:

Bug-fix - fix link problems due to duplicate symbols on Mac Darwin.

Location:
trunk/source
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/source/cddefines.h

    r1856 r1899  
    13401340}; 
    13411341 
     1342/* Explicit instantiations for debugging purposes */ 
     1343INSTANTIATE_MULTI_ARR( quantumState, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL ); 
     1344INSTANTIATE_MULTI_ARR( transition, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL ); 
     1345 
    13421346 
    13431347/*************************************************************************** 

  • trunk/source/container_classes.h

    r1825 r1899  
    17081708 
    17091709#define INSTANTIATE_MULTI_ARR( TYPE, LAYOUT, BC ) \ 
    1710 template TYPE& n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1711 template const n_pointer<TYPE,1,LAYOUT,BC> n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1712 template const n_pointer<TYPE,2,LAYOUT,BC> n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1713 template const n_pointer<TYPE,3,LAYOUT,BC> n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1714 template const n_pointer<TYPE,4,LAYOUT,BC> n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1715 template const n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t); \ 
    1716 template const n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t); \ 
    1717 template const n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t); \ 
    1718 template const n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t); \ 
    1719 template const n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t); \ 
    1720 template const TYPE& const_n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1721 template const const_n_pointer<TYPE,1,LAYOUT,BC> const_n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1722 template const const_n_pointer<TYPE,2,LAYOUT,BC> const_n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1723 template const const_n_pointer<TYPE,3,LAYOUT,BC> const_n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1724 template const const_n_pointer<TYPE,4,LAYOUT,BC> const_n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1725 template const const_n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1726 template const const_n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1727 template const const_n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1728 template const const_n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1729 template const const_n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t) const; \ 
    1730 template TYPE& basic_pntr<TYPE,2,LAYOUT,BC>::operator* () const; \ 
    1731 template TYPE& basic_pntr<TYPE,3,LAYOUT,BC>::operator* () const; \ 
    1732 template TYPE& basic_pntr<TYPE,4,LAYOUT,BC>::operator* () const; \ 
    1733 template TYPE& basic_pntr<TYPE,5,LAYOUT,BC>::operator* () const; \ 
    1734 template TYPE& basic_pntr<TYPE,6,LAYOUT,BC>::operator* () const 
     1710EXTERN template TYPE& n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1711EXTERN template const n_pointer<TYPE,1,LAYOUT,BC> n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1712EXTERN template const n_pointer<TYPE,2,LAYOUT,BC> n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1713EXTERN template const n_pointer<TYPE,3,LAYOUT,BC> n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1714EXTERN template const n_pointer<TYPE,4,LAYOUT,BC> n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1715EXTERN template const n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t); \ 
     1716EXTERN template const n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t); \ 
     1717EXTERN template const n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t); \ 
     1718EXTERN template const n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t); \ 
     1719EXTERN template const n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t); \ 
     1720EXTERN template const TYPE& const_n_pointer<TYPE,1,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1721EXTERN template const const_n_pointer<TYPE,1,LAYOUT,BC> const_n_pointer<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1722EXTERN template const const_n_pointer<TYPE,2,LAYOUT,BC> const_n_pointer<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1723EXTERN template const const_n_pointer<TYPE,3,LAYOUT,BC> const_n_pointer<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1724EXTERN template const const_n_pointer<TYPE,4,LAYOUT,BC> const_n_pointer<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1725EXTERN template const const_n_pointer<TYPE,1,LAYOUT,BC> multi_arr<TYPE,2,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1726EXTERN template const const_n_pointer<TYPE,2,LAYOUT,BC> multi_arr<TYPE,3,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1727EXTERN template const const_n_pointer<TYPE,3,LAYOUT,BC> multi_arr<TYPE,4,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1728EXTERN template const const_n_pointer<TYPE,4,LAYOUT,BC> multi_arr<TYPE,5,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1729EXTERN template const const_n_pointer<TYPE,5,LAYOUT,BC> multi_arr<TYPE,6,LAYOUT,BC>::operator[] (const size_t) const; \ 
     1730EXTERN template TYPE& basic_pntr<TYPE,2,LAYOUT,BC>::operator* () const; \ 
     1731EXTERN template TYPE& basic_pntr<TYPE,3,LAYOUT,BC>::operator* () const; \ 
     1732EXTERN template TYPE& basic_pntr<TYPE,4,LAYOUT,BC>::operator* () const; \ 
     1733EXTERN template TYPE& basic_pntr<TYPE,5,LAYOUT,BC>::operator* () const; \ 
     1734EXTERN template TYPE& basic_pntr<TYPE,6,LAYOUT,BC>::operator* () const 
    17351735 
    17361736INSTANTIATE_MULTI_ARR( bool, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL ); 

  • trunk/source/iso_create.cpp

    r1822 r1899  
    4141 
    4242char chL[21]={'S','P','D','F','G','H','I','K','L','M','N','O','Q','R','T','U','V','W','X','Y','Z'}; 
    43  
    44 /* Explicit instantiations for debugging purposes */ 
    45 INSTANTIATE_MULTI_ARR( quantumState, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL ); 
    46 INSTANTIATE_MULTI_ARR( transition, MEM_LAYOUT_VAL, lgBOUNDSCHECKVAL ); 
    4743 
    4844void iso_create(void)