aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2010-04-26 18:05:11 -0500
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 16:45:40 +0000
commit7f424bf03e130ea5a171e594e7d75c4c9660a988 (patch)
treeb24158ea50e2701a1410c152c9ebd318d9676042
parent8d523eaf8968d1a3edebb3bf54401c5c45432645 (diff)
CarpetLib: Replace "class" by "typename" in template arguments
Replace "class" by "typename" in template arguments in bbox.hh, bboxset.hh, and vect.hh.
-rw-r--r--Carpet/CarpetLib/src/bbox.hh16
-rw-r--r--Carpet/CarpetLib/src/bboxset.hh84
2 files changed, 50 insertions, 50 deletions
diff --git a/Carpet/CarpetLib/src/bbox.hh b/Carpet/CarpetLib/src/bbox.hh
index 5b5029bdc..d2dac83cc 100644
--- a/Carpet/CarpetLib/src/bbox.hh
+++ b/Carpet/CarpetLib/src/bbox.hh
@@ -22,12 +22,12 @@ using namespace std;
// Forward declaration
-template<class T, int D> class bbox;
+template<typename T, int D> class bbox;
// Input/Output
-template<class T, int D>
+template<typename T, int D>
istream& operator>> (istream& is, bbox<T,D>& b);
-template<class T, int D>
+template<typename T, int D>
ostream& operator<< (ostream& os, const bbox<T,D>& b);
@@ -36,7 +36,7 @@ ostream& operator<< (ostream& os, const bbox<T,D>& b);
* A bounding box, i.e., a rectangle with lower and upper bound and a
* stride.
*/
-template<class T, int D>
+template<typename T, int D>
class bbox {
// Fields
@@ -215,9 +215,9 @@ public:
// Memory usage
-template<class T, int D>
+template<typename T, int D>
inline size_t memoryof (bbox<T,D> const & b) CCTK_ATTRIBUTE_CONST;
-template<class T, int D>
+template<typename T, int D>
inline size_t memoryof (bbox<T,D> const & b) { return b.memory(); }
@@ -225,7 +225,7 @@ inline size_t memoryof (bbox<T,D> const & b) { return b.memory(); }
// Input
/** Read a formatted bbox from a stream. */
-template<class T,int D>
+template<typename T,int D>
inline istream& operator>> (istream& is, bbox<T,D>& b) {
b.input(is);
return is;
@@ -236,7 +236,7 @@ inline istream& operator>> (istream& is, bbox<T,D>& b) {
// Output
/** Write a bbox formatted to a stream. */
-template<class T,int D>
+template<typename T,int D>
inline ostream& operator<< (ostream& os, const bbox<T,D>& b) {
b.output(os);
return os;
diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh
index 5d206da33..de68e5b25 100644
--- a/Carpet/CarpetLib/src/bboxset.hh
+++ b/Carpet/CarpetLib/src/bboxset.hh
@@ -16,30 +16,30 @@ using namespace std;
// Forward declaration
-template<class T, int D> class bboxset;
+template<typename T, int D> class bboxset;
-// template<class T,int D>
+// template<typename T,int D>
// bboxset<T,D> operator+ (const bbox<T,D>& b1, const bbox<T,D>& b2);
-// template<class T,int D>
+// template<typename T,int D>
// bboxset<T,D> operator+ (const bbox<T,D>& b, const bboxset<T,D>& s);
-// template<class T,int D>
+// template<typename T,int D>
// bboxset<T,D> operator- (const bbox<T,D>& b1, const bbox<T,D>& b2);
-// template<class T,int D>
+// template<typename T,int D>
// bboxset<T,D> operator- (const bbox<T,D>& b, const bboxset<T,D>& s);
// Input
-template<class T,int D>
+template<typename T,int D>
istream& operator>> (istream& is, bboxset<T,D>& s);
// Output
-template<class T,int D>
+template<typename T,int D>
ostream& operator<< (ostream& os, const bboxset<T,D>& s);
// Bounding box class
-template<class T, int D>
+template<typename T, int D>
class bboxset {
// Types
@@ -160,89 +160,89 @@ public:
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator+ (const bbox<T,D>& b1, const bbox<T,D>& b2) {
return bboxset<T,D>(b1) + bboxset<T,D>(b2);
}
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator+ (const bbox<T,D>& b, const bboxset<T,D>& s) {
return bboxset<T,D>(b) + s;
}
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator- (const bbox<T,D>& b1, const bbox<T,D>& b2) {
return bboxset<T,D>::minus(b1,b2);
}
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator- (const bbox<T,D>& b, const bboxset<T,D>& s) {
return bboxset<T,D>::minus(b,s);
}
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator| (const bbox<T,D>& b, const bboxset<T,D>& s) {
return s | b;
}
-template<class T,int D>
+template<typename T,int D>
inline bboxset<T,D> operator& (const bbox<T,D>& b, const bboxset<T,D>& s) {
return s & b;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator== (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator== (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) == s;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator!= (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator!= (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) != s;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator< (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator< (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) < s;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator<= (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator<= (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) <= s;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator> (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator> (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) > s;
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator>= (const bbox<T,D>& b, const bboxset<T,D>& s)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator>= (const bbox<T,D>& b, const bboxset<T,D>& s)
{
return bboxset<T,D>(b) >= s;
@@ -250,55 +250,55 @@ inline bool operator>= (const bbox<T,D>& b, const bboxset<T,D>& s)
-template<class T,int D>
+template<typename T,int D>
inline bool operator== (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator== (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s == bboxset<T,D>(b);
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator!= (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator!= (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s != bboxset<T,D>(b);
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator< (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator< (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s < bboxset<T,D>(b);
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator<= (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator<= (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s <= bboxset<T,D>(b);
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator> (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator> (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s > bboxset<T,D>(b);
}
-template<class T,int D>
+template<typename T,int D>
inline bool operator>= (const bboxset<T,D>& s, const bbox<T,D>& b)
CCTK_ATTRIBUTE_PURE;
-template<class T,int D>
+template<typename T,int D>
inline bool operator>= (const bboxset<T,D>& s, const bbox<T,D>& b)
{
return s >= bboxset<T,D>(b);
@@ -307,17 +307,17 @@ inline bool operator>= (const bboxset<T,D>& s, const bbox<T,D>& b)
// Memory usage
-template<class T, int D>
+template<typename T, int D>
inline size_t memoryof (bboxset<T,D> const & s)
CCTK_ATTRIBUTE_PURE;
-template<class T, int D>
+template<typename T, int D>
inline size_t memoryof (bboxset<T,D> const & s)
{ return s.memory(); }
// Input
-template<class T,int D>
+template<typename T,int D>
inline istream& operator>> (istream& is, bboxset<T,D>& s) {
return s.input(is);
}
@@ -325,7 +325,7 @@ inline istream& operator>> (istream& is, bboxset<T,D>& s) {
// Output
-template<class T,int D>
+template<typename T,int D>
inline ostream& operator<< (ostream& os, const bboxset<T,D>& s) {
return s.output(os);
}