Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CoMISo
Base
Commits
be2213b8
Commit
be2213b8
authored
Aug 16, 2017
by
Max Lyon
Browse files
Merge branch 'fix_progress_macros' into merge_from_reform
parents
a514eff0
d5b0d484
Changes
1
Hide whitespace changes
Inline
Side-by-side
Debug/DebOut.hh
View file @
be2213b8
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment