CarpetLib: Disable bboxset2 by default

Change from CARPET_NO_BBOXSET2 and CARPET_BBOXSET2 to CARPET_ENABLE_BBOXSET2 (build it) and CARPET_USE_BBOXSET2 (use it).

5 files changed, 16 insertions, 16 deletions

diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh
index 463e19f54..d0407b7c4 100644
--- a/Carpet/CarpetLib/src/bboxset.hh
+++ b/Carpet/CarpetLib/src/bboxset.hh
@@ -2,11 +2,11 @@
 #define BBOXSET_HH
 
 #include "bboxset1.hh"
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 #  include "bboxset2.hh"
 #endif
 
-#ifdef CARPET_BBOXSET2
+#ifdef CARPET_USE_BBOXSET2
 using namespace bboxset2;
 #else
 using namespace bboxset1;
diff --git a/Carpet/CarpetLib/src/bboxset2.cc b/Carpet/CarpetLib/src/bboxset2.cc
index 447d04951..77bbcd085 100644
--- a/Carpet/CarpetLib/src/bboxset2.cc
+++ b/Carpet/CarpetLib/src/bboxset2.cc
@@ -1,6 +1,6 @@
 #include <cctk.h>
 
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 
 #include "bboxset2.hh"
 
@@ -35,4 +35,4 @@ namespace bboxset2 {
   
 } // namespace bboxset2
 
-#endif  // #ifndef CARPET_NO_BBOXSET2
+#endif  // #ifdef CARPET_ENABLE_BBOXSET2
diff --git a/Carpet/CarpetLib/src/bboxset2.hh b/Carpet/CarpetLib/src/bboxset2.hh
index bac295377..c3a78687b 100644
--- a/Carpet/CarpetLib/src/bboxset2.hh
+++ b/Carpet/CarpetLib/src/bboxset2.hh
@@ -23,7 +23,7 @@ using namespace std;
 
 
 
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 
 namespace bboxset2 {
 
@@ -1362,7 +1362,7 @@ inline ostream& operator<<(ostream& os, const bboxset<T,D>& bs)
 
 } // namespace bboxset2
 
-#endif  // #ifndef CARPET_NO_BBOXSET2
+#endif  // #ifdef CARPET_ENABLE_BBOXSET2
 
 
 
diff --git a/Carpet/CarpetLib/src/defs.cc b/Carpet/CarpetLib/src/defs.cc
index f2a304e7a..3dfc2c5ad 100644
--- a/Carpet/CarpetLib/src/defs.cc
+++ b/Carpet/CarpetLib/src/defs.cc
@@ -285,7 +285,7 @@ ostream& output (ostream& os, const set<T>& s) {
   return os;
 }
 
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 // Shared pointer output
 template<class T>
 ostream& output (ostream& os, const shared_ptr<T>& s) {
@@ -355,7 +355,7 @@ template size_t memoryof (vector<bbox<int,1> > const & v);
 template size_t memoryof (vector<bbox<int,2> > const & v);
 template size_t memoryof (vector<bbox<int,3> > const & v);
 template size_t memoryof (vector<bboxset1::bboxset<int,dim> > const & v);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 template size_t memoryof (vector<bboxset2::bboxset<int,dim>> const & v);
 #endif
 template size_t memoryof (vector<ivect> const & v);
@@ -394,7 +394,7 @@ template istream& input (istream& os, vector<bbox<int,2> >& v);
 template istream& input (istream& os, vector<bbox<int,3> >& v);
 //template istream& input (istream& os, vector<rbbox>& v);
 template istream& input (istream& os, vector<bboxset1::bboxset<int,dim> >& v);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 template istream& input (istream& os, vector<bboxset2::bboxset<int,dim>>& v);
 #endif
 template istream& input (istream& os, vector<ivect>& v);
@@ -415,7 +415,7 @@ template istream& input (istream& os, vector<vector<vector<region_t> > >& v);
 
 //template ostream& output (ostream& os, const list<ibbox>& l);
 //template ostream& output (ostream& os, const list<region_t>& l);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 //template ostream& output (ostream& os, const map<int,shared_ptr<bboxset2::bboxset<int,0> >>& m);
 //template ostream& output (ostream& os, const map<int,shared_ptr<bboxset2::bboxset<int,1> >>& m);
 //template ostream& output (ostream& os, const map<int,shared_ptr<bboxset2::bboxset<int,2> >>& m);
@@ -428,7 +428,7 @@ template ostream& output (ostream& os, const set<bbox<int,1> >& s);
 template ostream& output (ostream& os, const set<bbox<int,2> >& s);
 template ostream& output (ostream& os, const set<bbox<int,3> >& s);
 //template ostream& output (ostream& os, const set<bboxset1::bboxset<int,dim> >& s);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 //template ostream& output (ostream& os, const shared_ptr<bboxset2::bboxset<int,0> >& s);
 #endif
 //template ostream& output (ostream& os, const stack<ibbox>& s);
@@ -440,7 +440,7 @@ template ostream& output (ostream& os, const vector<bbox<int,2> >& v);
 template ostream& output (ostream& os, const vector<bbox<int,3> >& v);
 template ostream& output (ostream& os, const vector<rbbox>& v);
 template ostream& output (ostream& os, const vector<bboxset1::bboxset<int,dim> >& v);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 template ostream& output (ostream& os, const vector<bboxset2::bboxset<int,dim>>& v);
 #endif
 template ostream& output (ostream& os, const vector<ivect>& v);
diff --git a/Carpet/CarpetLib/src/defs.hh b/Carpet/CarpetLib/src/defs.hh
index e52c94d12..398057d4d 100644
--- a/Carpet/CarpetLib/src/defs.hh
+++ b/Carpet/CarpetLib/src/defs.hh
@@ -70,7 +70,7 @@ char const * const eol = "\n";
 template<typename T, int D> class vect;
 template<typename T, int D> class bbox;
 namespace bboxset1 { template<typename T, int D> class bboxset; }
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 namespace bboxset2 { template<typename T, int D> class bboxset; }
 #endif
 template<typename T, int D, typename P> class fulltree;
@@ -83,7 +83,7 @@ typedef bbox<int,dim>       ibbox;
 typedef bbox<CCTK_INT,dim>  jbbox;
 typedef bbox<CCTK_REAL,dim> rbbox;
 namespace bboxset1 { typedef bboxset<int,dim> ibset; }
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 namespace bboxset2 { typedef bboxset<int,dim> ibset; }
 #endif
 
@@ -338,7 +338,7 @@ template<class T> ostream& output (ostream& os, const list<T>& l);
 template<class S, class T> ostream& output (ostream& os, const map<S,T>& m);
 template<class S, class T> ostream& output (ostream& os, const pair<S,T>& p);
 template<class T> ostream& output (ostream& os, const set<T>& s);
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 template<class T> ostream& output (ostream& os, const shared_ptr<T>& s);
 #endif
 template<class T> ostream& output (ostream& os, const stack<T>& s);
@@ -364,7 +364,7 @@ inline ostream& operator<< (ostream& os, const set<T>& s) {
   return output(os,s);
 }
 
-#ifndef CARPET_NO_BBOXSET2
+#ifdef CARPET_ENABLE_BBOXSET2
 template<class T>
 inline ostream& operator<< (ostream& os, const shared_ptr<T>& s) {
   return output(os,s);