Merge branch 'master' into master

AliceO2Group · Mar 15, 2018 · 942a986 · 942a986
2 parents 1264b93 + ef8c21e
commit 942a986
Show file tree

Hide file tree

Showing 5 changed files with 211 additions and 127 deletions.
diff --git a/include/Common/Thread.h b/include/Common/Thread.h
@@ -60,7 +60,6 @@ class Thread {
 
   private:
     std::chrono::time_point<std::chrono::high_resolution_clock> t0; // time of reset
-    double tmax; // duration between reset and timeout condition, in seconds
 };
 
 } // namespace Common