diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2012-02-24 23:02:22 -0500 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2012-09-11 18:23:05 +0100 |
| commit | 0f0235b7a2a02a93cfe757d977ed56c2469dc673 (patch) | |
| tree | c9ebc615cbee510ddefa3d575e36ba4a01bbc40c /Carpet/CarpetLib/src/ggf.hh | |
| parent | 5f566b7daa4e0d1d14536600b31207a1bc4dfc64 (diff) | |
CarpetLib: Remove/correct ATTRIBUTE_CONST and ATTRIBUTE_PURE declarations
Diffstat (limited to 'Carpet/CarpetLib/src/ggf.hh')
| -rw-r--r-- | Carpet/CarpetLib/src/ggf.hh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Carpet/CarpetLib/src/ggf.hh b/Carpet/CarpetLib/src/ggf.hh index 74ebd15ae..56878611c 100644 --- a/Carpet/CarpetLib/src/ggf.hh +++ b/Carpet/CarpetLib/src/ggf.hh @@ -84,10 +84,10 @@ public: virtual ~ggf (); // Comparison - bool operator== (const ggf& f) const CCTK_ATTRIBUTE_PURE; + bool operator== (const ggf& f) const CCTK_MEMBER_ATTRIBUTE_PURE; // Querying - int timelevels (int const ml, int const rl) const CCTK_ATTRIBUTE_PURE + int timelevels (int const ml, int const rl) const { return timelevels_.AT(ml).AT(rl); } @@ -205,8 +205,8 @@ public: // Output - virtual size_t memory () const CCTK_ATTRIBUTE_PURE = 0; - static size_t allmemory () CCTK_ATTRIBUTE_PURE; + virtual size_t memory () const CCTK_MEMBER_ATTRIBUTE_PURE = 0; + static size_t allmemory () CCTK_MEMBER_ATTRIBUTE_PURE; virtual ostream& output (ostream& os) const = 0; private: @@ -218,7 +218,6 @@ private: -inline size_t memoryof (ggf const & f) CCTK_ATTRIBUTE_PURE; inline size_t memoryof (ggf const & f) { return f.memory (); |