CarpetLib: Replace "class" by "template" in template arguments in bboxset.cc

1 files changed, 34 insertions, 34 deletions

diff --git a/Carpet/CarpetLib/src/bboxset.cc b/Carpet/CarpetLib/src/bboxset.cc
index a5748a7c6..595a107d8 100644
--- a/Carpet/CarpetLib/src/bboxset.cc
+++ b/Carpet/CarpetLib/src/bboxset.cc
@@ -14,24 +14,24 @@ using namespace std;
 
 
 // Constructors
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>::bboxset () {
   assert (invariant());
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>::bboxset (const box& b) {
   //S if (!b.empty()) bs.insert(b);
   if (!b.empty()) bs.push_back(b);
   assert (invariant());
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>::bboxset (const bboxset& s): bs(s.bs) {
   assert (invariant());
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>::bboxset (const list<box>& lb) {
   for (typename list<box>::const_iterator
          li = lb.begin(); li != lb.end(); ++ li)
@@ -41,7 +41,7 @@ bboxset<T,D>::bboxset (const list<box>& lb) {
   normalize();
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>::bboxset (const vector<list<box> >& vlb) {
   for (typename vector<list<box> >::const_iterator
          vli = vlb.begin(); vli != vlb.end(); ++ vli)
@@ -59,7 +59,7 @@ bboxset<T,D> bboxset<T,D>::poison () {
 
 
 // Invariant
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::invariant () const {
 // This is very slow when there are many bboxes
 #if 0 && defined(CARPET_DEBUG)
@@ -78,7 +78,7 @@ bool bboxset<T,D>::invariant () const {
 
 
 // Normalisation
-template<class T, int D>
+template<typename T, int D>
 void bboxset<T,D>::normalize ()
 {
   assert (invariant());
@@ -207,7 +207,7 @@ void bboxset<T,D>::normalize ()
 
 
 // Accessors
-template<class T, int D>
+template<typename T, int D>
 typename bboxset<T,D>::size_type bboxset<T,D>::size () const {
   size_type s=0;
   for (const_iterator bi=begin(); bi!=end(); ++bi) {
@@ -224,7 +224,7 @@ typename bboxset<T,D>::size_type bboxset<T,D>::size () const {
 // Queries
 
 // Intersection
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::intersects (const box& b) const {
   for (const_iterator bi=begin(); bi!=end(); ++bi) {
     if ((*bi).intersects(b)) return true;
@@ -235,7 +235,7 @@ bool bboxset<T,D>::intersects (const box& b) const {
 
 
 // Add (bboxes that don't overlap)
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator+= (const bboxset& s) {
   for (const_iterator bi=s.begin(); bi!=s.end(); ++bi) {
     *this += *bi;
@@ -244,14 +244,14 @@ bboxset<T,D>& bboxset<T,D>::operator+= (const bboxset& s) {
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::add_transfer (bboxset& s) {
   bs.splice (bs.end(), s.bs);
   assert (invariant());
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator+ (const box& b) const {
   bboxset r(*this);
   r += b;
@@ -259,7 +259,7 @@ bboxset<T,D> bboxset<T,D>::operator+ (const box& b) const {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator+ (const bboxset& s) const {
   bboxset r(*this);
   r += s;
@@ -270,7 +270,7 @@ bboxset<T,D> bboxset<T,D>::operator+ (const bboxset& s) const {
 
 
 // Union
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator|= (const box& b) {
   bboxset tmp = b - *this;
   add_transfer (tmp);
@@ -278,7 +278,7 @@ bboxset<T,D>& bboxset<T,D>::operator|= (const box& b) {
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator|= (const bboxset& s) {
   bboxset tmp = s - *this;
   add_transfer (tmp);
@@ -286,7 +286,7 @@ bboxset<T,D>& bboxset<T,D>::operator|= (const bboxset& s) {
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator| (const box& b) const {
   bboxset r(*this);
   r |= b;
@@ -294,7 +294,7 @@ bboxset<T,D> bboxset<T,D>::operator| (const box& b) const {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator| (const bboxset& s) const {
   bboxset r(*this);
   r |= s;
@@ -305,7 +305,7 @@ bboxset<T,D> bboxset<T,D>::operator| (const bboxset& s) const {
 
 
 // Intersection
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator& (const box& b) const {
   // start with an empty set
   bboxset r;
@@ -318,7 +318,7 @@ bboxset<T,D> bboxset<T,D>::operator& (const box& b) const {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator& (const bboxset& s) const {
   // start with an empty set
   bboxset r;
@@ -332,14 +332,14 @@ bboxset<T,D> bboxset<T,D>::operator& (const bboxset& s) const {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator&= (const box& b) {
   *this = *this & b;
   assert (invariant());
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator&= (const bboxset& s) {
   *this = *this & s;
   assert (invariant());
@@ -349,7 +349,7 @@ bboxset<T,D>& bboxset<T,D>::operator&= (const bboxset& s) {
 
 
 // Difference
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::minus (const bbox<T,D>& b1, const bbox<T,D>& b2) {
   assert (b1.is_aligned_with(b2));
   if (b1.empty()) return bboxset<T,D>();
@@ -387,7 +387,7 @@ bboxset<T,D> bboxset<T,D>::minus (const bbox<T,D>& b1, const bbox<T,D>& b2) {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator- (const box& b) const {
   // start with an empty set
   bboxset r;
@@ -401,7 +401,7 @@ bboxset<T,D> bboxset<T,D>::operator- (const box& b) const {
   return r;
 }
   
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D>& bboxset<T,D>::operator-= (const bboxset& s) {
   for (const_iterator bi=s.begin(); bi!=s.end(); ++bi) {
     *this -= *bi;
@@ -410,7 +410,7 @@ bboxset<T,D>& bboxset<T,D>::operator-= (const bboxset& s) {
   return *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::operator- (const bboxset& s) const {
   bboxset r(*this);
   r -= s;
@@ -418,7 +418,7 @@ bboxset<T,D> bboxset<T,D>::operator- (const bboxset& s) const {
   return r;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::minus (const bbox<T,D>& b, const bboxset<T,D>& s) {
   bboxset<T,D> r = bboxset<T,D>(b) - s;
   assert (r.invariant());
@@ -428,32 +428,32 @@ bboxset<T,D> bboxset<T,D>::minus (const bbox<T,D>& b, const bboxset<T,D>& s) {
 
 
 // Equality
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator<= (const bboxset<T,D>& s) const {
   return (*this - s).empty();
 }
 
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator< (const bboxset<T,D>& s) const {
   return (*this - s).empty() && ! (s - *this).empty();
 }
 
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator>= (const bboxset<T,D>& s) const {
   return s <= *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator> (const bboxset<T,D>& s) const {
   return s < *this;
 }
 
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator== (const bboxset<T,D>& s) const {
   return (*this <= s) && (*this >= s);
 }
 
-template<class T, int D>
+template<typename T, int D>
 bool bboxset<T,D>::operator!= (const bboxset<T,D>& s) const {
   return ! (*this == s);
 }
@@ -461,7 +461,7 @@ bool bboxset<T,D>::operator!= (const bboxset<T,D>& s) const {
 
 
 // Input
-template<class T,int D>
+template<typename T,int D>
 istream& bboxset<T,D>::input (istream& is) {
   T Tdummy;
   try {
@@ -497,7 +497,7 @@ istream& bboxset<T,D>::input (istream& is) {
 
 
 // Output
-template<class T,int D>
+template<typename T,int D>
 ostream& bboxset<T,D>::output (ostream& os) const {
   T Tdummy;
   os << "bboxset<" << typestring(Tdummy) << "," << D << ">:{"