projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix clashes caused by ERROR, WARNING etc. as variables.
[dcpomatic.git]
/
src
/
lib
/
timer.h
diff --git
a/src/lib/timer.h
b/src/lib/timer.h
index f509a7492888178d6192d0c4af8ec2e38d30d7d4..4a5aa12de331c0fe5b024144bc18923e76ccc8eb 100644
(file)
--- a/
src/lib/timer.h
+++ b/
src/lib/timer.h
@@
-22,8
+22,8
@@
* @brief Some timing classes for debugging and profiling.
*/
* @brief Some timing classes for debugging and profiling.
*/
-#ifndef D
VD
OMATIC_TIMER_H
-#define D
VD
OMATIC_TIMER_H
+#ifndef D
CP
OMATIC_TIMER_H
+#define D
CP
OMATIC_TIMER_H
#include <string>
#include <map>
#include <string>
#include <map>
@@
-53,7
+53,7
@@
private:
* spends in one of a set of states.
*
* Once constructed, the caller can call set_state() whenever
* spends in one of a set of states.
*
* Once constructed, the caller can call set_state() whenever
- * its state changes.
When StateTimer is destroyed, it will
+ * its state changes. When StateTimer is destroyed, it will
* output (to cout) a summary of the time spent in each state.
*/
class StateTimer
* output (to cout) a summary of the time spent in each state.
*/
class StateTimer