Requirements: Remove dependency on defs.hh

3 files changed, 19 insertions, 5 deletions

diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc
index 11b92cedd..b383862f0 100644
--- a/Carpet/Requirements/src/Requirements.cc
+++ b/Carpet/Requirements/src/Requirements.cc
@@ -1,7 +1,5 @@
 #include <Requirements.hh>
 
-#include <defs.hh>
-
 #include <cctk.h>
 #include <cctk_Parameters.h>
 #include <cctk_Functions.h>
@@ -19,6 +17,7 @@
 #include <map>
 #include <string>
 #include <vector>
+
 #include <clause.hh>
 #include <clauses.hh>
 #include <util.hh>
@@ -324,7 +323,7 @@ namespace Requirements {
   {
     std::vector<bool>& ivs = *static_cast<std::vector<bool>*>(callback_arg);
     
-    ivs.at(id) = true;
+    ivs.AT(id) = true;
   }
   
   void Setup(int const maps)
diff --git a/Carpet/Requirements/src/clause.cc b/Carpet/Requirements/src/clause.cc
index b25d102e0..a9d25625b 100644
--- a/Carpet/Requirements/src/clause.cc
+++ b/Carpet/Requirements/src/clause.cc
@@ -1,4 +1,3 @@
-
 #include <cctk.h>
 #include <cctki_Schedule.h>
 
@@ -135,7 +134,7 @@ namespace Requirements {
   
   void clause_t::output(ostream& os) const
   {
-    char* const groupname = CCTK_GroupNameFromVarI(vars.at(0));
+    char* const groupname = CCTK_GroupNameFromVarI(vars.AT(0));
     os << groupname;
     free(groupname);
     os << "{";
diff --git a/Carpet/Requirements/src/clause.hh b/Carpet/Requirements/src/clause.hh
index 23e9b0470..d27659b8b 100644
--- a/Carpet/Requirements/src/clause.hh
+++ b/Carpet/Requirements/src/clause.hh
@@ -2,10 +2,26 @@
 #define CLAUSE_HH
 
 #include <cctk_Schedule.h>
+
 #include <vector>
 
 using namespace std;
 
+
+
+// Use this macro AT instead of vector's operator[] or at(). Depending
+// on the macro NDEBUG, this macro AT either checks for valid indices
+// or not.
+#ifndef AT
+#  ifndef NDEBUG
+#    define AT(index) at(index)
+#  else
+#    define AT(index) operator[](index)
+#  endif
+#endif
+
+
+
 namespace Requirements {
 
   // Represent scheduled functions and their dependencies