aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2012-05-03 21:34:07 -0400
committerErik Schnetter <schnetter@gmail.com>2012-05-03 21:34:07 -0400
commitdd9cf52dc18fc97344cda438dc2cf5713bf0ff61 (patch)
treec6d7f8557e25f7af36a12317b14b237cfbc469dd
parent69cbd4989a2d565d4c919fa9018edca91f4601c3 (diff)
CarpetLib: Remove superfluous memoryof() definitions
Remove definitions for memoryof(T*) sinfc there is already memoryof(T const*). xlC does not like having both.
-rw-r--r--Carpet/CarpetLib/src/defs.hh2
1 files changed, 0 insertions, 2 deletions
diff --git a/Carpet/CarpetLib/src/defs.hh b/Carpet/CarpetLib/src/defs.hh
index ad9cd1919..6571648f7 100644
--- a/Carpet/CarpetLib/src/defs.hh
+++ b/Carpet/CarpetLib/src/defs.hh
@@ -571,9 +571,7 @@ inline size_t memoryof (unsigned long long const & e) { return sizeof e; }
inline size_t memoryof (float const & e) { return sizeof e; }
inline size_t memoryof (double const & e) { return sizeof e; }
inline size_t memoryof (long double const & e) { return sizeof e; }
-inline size_t memoryof (void * const & e) { return sizeof e; }
inline size_t memoryof (void const * const & e) { return sizeof e; }
-template<class T> inline size_t memoryof (T * const & e) { return sizeof e; }
template<class T> inline size_t memoryof (T const * const & e) { return sizeof e; }
template<class T> inline size_t memoryof (typename list<T>::iterator const & i) { return sizeof i; }
template<class T> inline size_t memoryof (typename list<T>::const_iterator const & i) { return sizeof i; }