projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reword again: Text -> Caption and Plain -> Text.
[dcpomatic.git]
/
src
/
lib
/
timer.h
diff --git
a/src/lib/timer.h
b/src/lib/timer.h
index f509a7492888178d6192d0c4af8ec2e38d30d7d4..9ea95c7203850f329b67178c3a3e5c9f5f73c822 100644
(file)
--- a/
src/lib/timer.h
+++ b/
src/lib/timer.h
@@
-1,20
+1,20
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
Copyright (C) 2000-2007 Paul Davis
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
Copyright (C) 2000-2007 Paul Davis
+ This file is part of DCP-o-matic.
-
This program
is free software; you can redistribute it and/or modify
+
DCP-o-matic
is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,12
+22,12
@@
* @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 <sys/time.h>
#include <string>
#include <map>
#include <string>
#include <map>
-#include <sys/time.h>
/** @class PeriodTimer
* @brief A class to allow timing of a period within the caller.
/** @class PeriodTimer
* @brief A class to allow timing of a period within the caller.
@@
-37,9
+37,9
@@
class PeriodTimer
{
public:
class PeriodTimer
{
public:
- PeriodTimer (std::string n);
+
explicit
PeriodTimer (std::string n);
~PeriodTimer ();
~PeriodTimer ();
-
+
private:
/** name to use when giving output */
private:
/** name to use when giving output */
@@
-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