Commit be2213b8 authored by Max Lyon's avatar Max Lyon

Merge branch 'fix_progress_macros' into merge_from_reform

parents a514eff0 d5b0d484
......@@ -3,11 +3,7 @@
#ifndef BASE_DEBOUT_HH_INCLUDED
#define BASE_DEBOUT_HH_INCLUDED
#ifdef PROGRESS_ON
#include "Base/Progress/ProgressNode.hh"
#else//PROGRESS_ON
#define PROGRESS_TICK
#endif//PROGRESS_ON
// DEB_ON is defined, or not, in CMakeLists.txt for primary project
#ifndef DEB_ON
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment