CycleClock: Do not abort when no good clock is available

3 files changed, 12 insertions, 4 deletions

diff --git a/Carpet/CycleClock/src/clock.cc b/Carpet/CycleClock/src/clock.cc
index a5de7ec00..4940db9e7 100644
--- a/Carpet/CycleClock/src/clock.cc
+++ b/Carpet/CycleClock/src/clock.cc
@@ -1,5 +1,7 @@
 #include "cycleclock.h"
 
+#ifdef HAVE_TICK_COUNTER
+
 #include <cctk.h>
 #include <cctk_Parameters.h>
 
@@ -181,3 +183,5 @@ namespace CycleClock {
   }
   
 } // namespace CycleClock
+
+#endif
diff --git a/Carpet/CycleClock/src/cycle.cc b/Carpet/CycleClock/src/cycle.cc
index 6c02c5c4d..265021c9d 100644
--- a/Carpet/CycleClock/src/cycle.cc
+++ b/Carpet/CycleClock/src/cycle.cc
@@ -1,5 +1,7 @@
 #include "cycleclock.h"
 
+#ifdef HAVE_TICK_COUNTER
+
 #include <cctk.h>
 
 
@@ -106,3 +108,5 @@ double seconds_per_tick()
   // }
   return cycleclock_tick;
 }
+
+#endif
diff --git a/Carpet/CycleClock/src/cycleclock.h b/Carpet/CycleClock/src/cycleclock.h
index 9e3a16cca..a733fcdb4 100644
--- a/Carpet/CycleClock/src/cycleclock.h
+++ b/Carpet/CycleClock/src/cycleclock.h
@@ -22,12 +22,12 @@ extern "C" {
   
 #include "cycle.h"
   
-#ifndef HAVE_TICK_COUNTER
-#  error "tick counter not available"
-#endif
-  
+#ifdef HAVE_TICK_COUNTER
   double seconds_per_tick(void);
   void measure_tick(void);
+#else
+#  warning "tick counter not available"
+#endif
   
 #ifdef __cplusplus
 }