diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-10 10:26:50 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-10 10:51:26 -0500 |
| commit | 05962e2d278286020dd87b208f47d6c9896818a7 (patch) | |
| tree | ed74b340459a754ef9909b47c3940713eb8a0101 /Carpet | |
| parent | bf4b44a12f0dfc2508b004c2bd9e063f65db72a5 (diff) | |
CarpetLib: Correct C++
Remove superfluous template declaration.
Add scope when calling static function.
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/CarpetLib/src/fulltree.cc | 5 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/fulltree.hh | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Carpet/CarpetLib/src/fulltree.cc b/Carpet/CarpetLib/src/fulltree.cc index 0318cb83c..cb6de5116 100644 --- a/Carpet/CarpetLib/src/fulltree.cc +++ b/Carpet/CarpetLib/src/fulltree.cc @@ -164,7 +164,7 @@ fulltree<T,D,P>::search (tvect const & ipos) const assert (not empty()); // cout << "fulltree::search ipos=" << ipos << endl; if (is_leaf()) return & p; - int const i = asearch (ipos[dir], bounds); + int const i = ::asearch (ipos[dir], bounds); // cout << "fulltree::search i=" << i << " size=" << subtrees.size() << endl; if (i<0 or i>=int(subtrees.size())) return NULL; // not found return subtrees.AT(i)->search(ipos); @@ -177,7 +177,7 @@ fulltree<T,D,P>::search (tvect const & ipos) assert (not empty()); // cout << "fulltree::search ipos=" << ipos << endl; if (is_leaf()) return & p; - int const i = asearch (ipos[dir], bounds); + int const i = ::asearch (ipos[dir], bounds); // cout << "fulltree::search i=" << i << " size=" << subtrees.size() << endl; if (i<0 or i>=int(subtrees.size())) return NULL; // not found return subtrees.AT(i)->search(ipos); @@ -489,6 +489,5 @@ int asearch (T const t, vector <T> const & ts) template class fulltree <int, dim, pseudoregion_t>; template size_t memoryof (fulltree <int, dim, pseudoregion_t> const & f); -template size_t memoryof (fulltree <int, dim, pseudoregion_t> * const & f); template ostream & operator<< (ostream & os, fulltree <int, dim, pseudoregion_t> const & f); diff --git a/Carpet/CarpetLib/src/fulltree.hh b/Carpet/CarpetLib/src/fulltree.hh index 0add256cc..4678759b6 100644 --- a/Carpet/CarpetLib/src/fulltree.hh +++ b/Carpet/CarpetLib/src/fulltree.hh @@ -175,9 +175,6 @@ public: template <typename T, int D, typename P> inline size_t memoryof (fulltree<T,D,P> const & f) { return f.memory(); } -template <typename T, int D, typename P> -inline size_t memoryof (fulltree<T,D,P> * const & fp) { return sizeof fp; } - // Output |