projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update xml_subtitle_test result now that subtitles are being compared; improve placem...
[dcpomatic.git]
/
src
/
lib
/
log.h
diff --git
a/src/lib/log.h
b/src/lib/log.h
index f20b0a14866b5aedda0b3b4de883e7b40d3cc7c3..300df743b9c7f4f790eafc4e465b45a7a1dfffe7 100644
(file)
--- a/
src/lib/log.h
+++ b/
src/lib/log.h
@@
-24,10
+24,10
@@
* @brief A very simple logging class.
*/
* @brief A very simple logging class.
*/
-#include <string>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
+#include <string>
/** @class Log
* @brief A very simple logging class.
/** @class Log
* @brief A very simple logging class.
@@
-48,7
+48,7
@@
public:
void set_types (int types);
void set_types (int types);
- virtual std::string head_and_tail () const = 0;
+ virtual std::string head_and_tail (
int amount = 1024
) const = 0;
protected:
protected:
@@
-69,7
+69,7
@@
class FileLog : public Log
public:
FileLog (boost::filesystem::path file);
public:
FileLog (boost::filesystem::path file);
- std::string head_and_tail () const;
+ std::string head_and_tail (
int amount = 1024
) const;
private:
void do_log (std::string m);
private:
void do_log (std::string m);
@@
-80,7
+80,7
@@
private:
class NullLog : public Log
{
public:
class NullLog : public Log
{
public:
- std::string head_and_tail () const {
+ std::string head_and_tail (
int
) const {
return "";
}
return "";
}