diff options
Diffstat (limited to 'src/jtutil/array.cc')
| -rw-r--r-- | src/jtutil/array.cc | 67 |
1 files changed, 39 insertions, 28 deletions
diff --git a/src/jtutil/array.cc b/src/jtutil/array.cc index c8e5c47..b6fbc99 100644 --- a/src/jtutil/array.cc +++ b/src/jtutil/array.cc @@ -33,12 +33,6 @@ #include "util.hh" #include "array.hh" -// everything in this file is inside these namespaces -namespace AHFinderDirect - { -namespace jtutil - { - //****************************************************************************** //****************************************************************************** //****************************************************************************** @@ -46,6 +40,8 @@ namespace jtutil // // This function constructs an array1d object. // +namespace jtutil + { template <typename T> array1d<T>::array1d(int min_i_in, int max_i_in, T *array_in /* = NULL */, @@ -77,18 +73,22 @@ if (we_own_array_) operator()(i) = T(0); } } + } // namespace jtutil:: //****************************************************************************** // // This function destroys an array1d object. // +namespace jtutil + { template <typename T> array1d<T>::~array1d() { if (we_own_array_) then delete[] array_; } + } // namespace jtutil:: //****************************************************************************** //****************************************************************************** @@ -97,6 +97,8 @@ if (we_own_array_) // // This function constructs an array2d object. // +namespace jtutil + { template <typename T> array2d<T>::array2d(int min_i_in, int max_i_in, int min_j_in, int max_j_in, @@ -135,18 +137,22 @@ if (we_own_array_) } } } + } // namespace jtutil:: //****************************************************************************** // // This function destroys an array2d object. // +namespace jtutil + { template <typename T> array2d<T>::~array2d() { if (we_own_array_) then delete[] array_; } + } // namespace jtutil:: //****************************************************************************** //****************************************************************************** @@ -155,6 +161,8 @@ if (we_own_array_) // // This function constructs an array3d object. // +namespace jtutil + { template <typename T> array3d<T>::array3d(int min_i_in, int max_i_in, int min_j_in, int max_j_in, @@ -202,18 +210,22 @@ if (we_own_array_) } } } + } // namespace jtutil:: //****************************************************************************** // // This function destroys an array3d object. // +namespace jtutil + { template <typename T> array3d<T>::~array3d() { if (we_own_array_) then delete[] array_; } + } // namespace jtutil:: //****************************************************************************** //****************************************************************************** @@ -223,6 +235,8 @@ if (we_own_array_) // // This function constructs an array4d object. // +namespace jtutil + { template <typename T> array4d<T>::array4d(int min_i_in, int max_i_in, int min_j_in, int max_j_in, @@ -278,6 +292,7 @@ if (we_own_array_) } } } + } // namespace jtutil:: #endif /* NOT_USED */ //****************************************************************************** @@ -286,12 +301,15 @@ if (we_own_array_) // // This function destroys an array4d object. // +namespace jtutil + { template <typename T> array4d<T>::~array4d() { if (we_own_array_) then delete[] array_; } + } // namespace jtutil:: #endif /* NOT_USED */ //****************************************************************************** @@ -302,40 +320,33 @@ if (we_own_array_) // ***** template instantiations ***** // -template class array1d<int>; +template class jtutil::array1d<int>; // FIXME: we shouldn't have to instantiate these both, the const one // is actually trivially derivable from the non-const one. :( -template class array1d< void *>; -template class array1d<const void *>; +template class jtutil::array1d< void *>; +template class jtutil::array1d<const void *>; #ifdef STANDALONE_TEST - template class array1d<float>; - template class array2d<float>; - template class array3d<float>; + template class jtutil::array1d<float>; + template class jtutil::array2d<float>; + template class jtutil::array3d<float>; #ifdef NOT_USED - template class array4d<float>; + template class jtutil::array4d<float>; #endif - template class array1d<double>; - template class array2d<double>; - template class array3d<double>; + template class jtutil::array1d<double>; + template class jtutil::array2d<double>; + template class jtutil::array3d<double>; #ifdef NOT_USED - template class array4d<double>; + template class jtutil::array4d<double>; #endif #else // full-fledged Cactus thorn - template class array1d<CCTK_REAL>; + template class jtutil::array1d<CCTK_REAL>; - template class array2d<CCTK_INT>; - template class array2d<CCTK_REAL>; + template class jtutil::array2d<CCTK_INT>; + template class jtutil::array2d<CCTK_REAL>; - template class array3d<CCTK_REAL>; + template class jtutil::array3d<CCTK_REAL>; #endif - -//****************************************************************************** -//****************************************************************************** -//****************************************************************************** - - } // namespace jtutil - } // namespace AHFinderDirect |