small fixes

This commit is contained in:
gabime 2014-03-22 16:37:48 +02:00
parent 8d83c0b2b0
commit 4ed60befbc
4 changed files with 16 additions and 13 deletions

View File

@ -19,7 +19,7 @@ int main(int argc, char* argv[])
{ {
if(argc || argv) {}; if(argc || argv) {};
const unsigned int howmany = 1000000; const unsigned int howmany = 1000000;
auto fsink = std::make_shared<sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5, 0); auto fsink = std::make_shared<sinks::rotating_file_sink>("log", "txt", 1024*1024*50 , 5, 0);
//auto fsink = std::make_shared<sinks::simple_file_sink>("simplelog", "txt"); //auto fsink = std::make_shared<sinks::simple_file_sink>("simplelog", "txt");
@ -27,7 +27,7 @@ int main(int argc, char* argv[])
logger cout_logger ("cout", {null_sink, sinks::stdout_sink()}); logger cout_logger ("cout", {null_sink, sinks::stdout_sink()});
cout_logger.info() << "Hello cout logger!"; cout_logger.info() << "Hello cout logger!";
logger my_logger ("my_logger", {null_sink}); logger my_logger ("my_logger", {null_sink});

View File

@ -9,7 +9,10 @@
// stores its contents on the stack when possible, in vector<char> otherwise // stores its contents on the stack when possible, in vector<char> otherwise
// NOTE: User should be remember that returned buffer might be on the stack!! // NOTE: User should be remember that returned buffer might be on the stack!!
namespace c11log { namespace details { namespace c11log
{
namespace details
{
template<std::size_t STACK_SIZE=128> template<std::size_t STACK_SIZE=128>
class fast_buf class fast_buf

View File

@ -19,14 +19,14 @@ public:
str_devicebuf(str_devicebuf&& other) = delete; str_devicebuf(str_devicebuf&& other) = delete;
str_devicebuf& operator=(const str_devicebuf&) = delete; str_devicebuf& operator=(const str_devicebuf&) = delete;
str_devicebuf& operator=(str_devicebuf&&) = delete; str_devicebuf& operator=(str_devicebuf&&) = delete;
bufpair_t buf() bufpair_t buf()
{ {
return _fastbuf.get(); return _fastbuf.get();
} }
void reset_str() void clear()
{ {
_fastbuf.clear(); _fastbuf.clear();
} }
@ -39,7 +39,7 @@ protected:
// copy the give buffer into the accumulated string. // copy the give buffer into the accumulated string.
// reserve initially 128 bytes which should be enough for common log lines // reserve initially 128 bytes which should be enough for common log lines
std::streamsize xsputn(const char_type* s, std::streamsize count) override std::streamsize xsputn(const char_type* s, std::streamsize count) override
{ {
_fastbuf.append(s, static_cast<unsigned int>(count)); _fastbuf.append(s, static_cast<unsigned int>(count));
return count; return count;
} }
@ -73,9 +73,9 @@ public:
return _dev.buf(); return _dev.buf();
} }
void reset_str() void clear()
{ {
_dev.reset_str(); _dev.clear();
} }
private: private:

View File

@ -38,13 +38,13 @@ public:
line_logger& operator=(const line_logger&) = delete; line_logger& operator=(const line_logger&) = delete;
line_logger& operator=(line_logger&&) = delete; line_logger& operator=(line_logger&&) = delete;
// The move ctor should only be called on start of logging line, // The move ctor should only be called on start of logging line,
// where no logging happened yet for this line so no need to copy the string from the other // where no logging happened yet for this line so no need to copy the string from the other
line_logger(line_logger&& other) : line_logger(line_logger&& other) :
_callback_logger(other._callback_logger), _callback_logger(other._callback_logger),
_oss(), _oss(),
_level(other._level), _level(other._level),
_enabled(other._enabled) {} _enabled(other._enabled) {}
~line_logger() ~line_logger()