fix: exclude setup in simulation mode

Author: not-matthias

google_benchmark/include/benchmark/benchmark.h

@@ -948,8 +948,6 @@ class BENCHMARK_EXPORT BENCHMARK_INTERNAL_CACHELINE_ALIGNED State {
   const IterationCount max_iterations;
 #if defined(CODSPEED_SIMULATION) || defined(CODSPEED_WALLTIME)
   codspeed::CodSpeed* codspeed_;
-#endif
-#ifdef CODSPEED_WALLTIME
   uint64_t resume_timestamp_;
 #endif
 

google_benchmark/src/benchmark.cc

@@ -198,8 +198,6 @@ State::State(std::string name, IterationCount max_iters,
       max_iterations(max_iters),
 #if defined(CODSPEED_SIMULATION) || defined(CODSPEED_WALLTIME)
       codspeed_(codspeed),
-#endif
-#ifdef CODSPEED_WALLTIME
       resume_timestamp_(0),
 #endif
       started_(false),
@@ -269,15 +267,15 @@ State::State(std::string name, IterationCount max_iters,
 }
 
 void State::PauseTiming() {
-#ifdef CODSPEED_WALLTIME
+#if defined(CODSPEED_WALLTIME) || defined(CODSPEED_SIMULATION)
   uint64_t pause_timestamp = measurement_current_timestamp();
 #endif
 
   // Add in time accumulated so far
   BM_CHECK(started_ && !finished_ && !skipped());
   timer_->StopTimer();
 
-#ifdef CODSPEED_WALLTIME
+#if defined(CODSPEED_WALLTIME) || defined(CODSPEED_SIMULATION)
   if (!is_warmup_ && resume_timestamp_ != 0) {
     measurement_add_benchmark_timestamps(resume_timestamp_, pause_timestamp);
     resume_timestamp_ = 0;
@@ -306,7 +304,7 @@ void State::ResumeTiming() {
     perf_counters_measurement_->Start();
   }
 
-#ifdef CODSPEED_WALLTIME
+#if defined(CODSPEED_WALLTIME) || defined(CODSPEED_SIMULATION)
   BM_CHECK(resume_timestamp_ == 0);
   resume_timestamp_ = measurement_current_timestamp();
 #endif