Commit Graph

1373 Commits

Author SHA1 Message Date
Daniel Chabrowski 5d08bd1709 Bump example's cmake version to 3.1
CMake 3.1 is used in main CMakeLists file, no reason not to use it in example.
Threads::Threads is introduced in cmake 3.1.
2018-02-11 21:16:15 +01:00
Daniel Chabrowski 646a140ed4 Specify CXX language explicitly in CMake
Marking project as CXX will disable detecting C compiler and other checks.
Removed 'INCLUDES DESTINATION' as it made the include path appear doubled.
2018-02-11 21:13:33 +01:00
Gabi Melman 5eef243ab6 Merge pull request #634 from ColinDuquesnoy/patch-1
Fix compilation error with GCC 8
2018-02-10 19:05:33 +02:00
Colin Duquesnoy 11ee6834f6 Fix compilation error with GCC 8
error: need 'typename' before 'std::conditional<std::is_same<char, char>::value, fmt::BasicMemoryWriter<char>, fmt::BasicMemoryWriter<wchar_t> >::type' because 'std::conditional<std::is_same<char, char>::value, fmt::BasicMemoryWriter<char>, fmt::BasicMemoryWriter<wchar_t> >' is a dependent scope
         std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
2018-02-10 15:15:46 +01:00
Gabi Melman c07e81a049 Merge pull request #632 from bschindler/wincolor_set_color_public
Make set_color public in wincolor_sink to retain configurability
2018-02-08 11:04:29 +02:00
Benjamin Schindler 05b2aabe0e Make set_color public in wincolor_sink to retain configurability 2018-02-08 09:14:45 +01:00
gabime 5ab033fba5 Fix issue #629 2018-02-05 12:20:57 +02:00
Gabi Melman 1dfc8282df Merge pull request #624 from yisonPylkita/modern_cmake_tests
Modern CMake in /tests
2018-02-03 19:10:44 +02:00
gabime f8aec1bdf1 Merge branch 'master' of https://github.com/gabime/spdlog.git 2018-02-03 18:58:10 +02:00
gabime 51a83da578 Repplaced map with unordered_map for level->colos mapping 2018-02-03 18:57:57 +02:00
yisonPylkita 38ccd51399 Modern CMake in /tests 2018-01-28 00:49:03 +01:00
Gabi Melman c336470320 Merge pull request #621 from rcarmich/fix_example_spelling_errors
Fixed spelling mistake in example.cpp
2018-01-24 22:42:31 +02:00
Ryan Carmichael da51d8dfd3 Fixed spelling mistake in example.cpp 2018-01-24 14:18:05 -06:00
Gabi Melman 22fdd3bf0f Merge pull request #615 from Qix-/master
A few small ANSI color improvements
2018-01-18 22:01:46 +02:00
Josh Junon cae749fc9b clear line after writing log message contents 2018-01-18 15:06:47 +01:00
Josh Junon 58e68725ae rename grey to black 2018-01-18 15:03:26 +01:00
Josh Junon a59f74e8a2 remove needless zeros in reset code 2018-01-18 15:03:03 +01:00
Gabi Melman f258af4364 Update CMakeLists.txt 2018-01-12 16:06:30 +02:00
gabime ccd675a286 version 0.16.3 2018-01-12 14:09:34 +02:00
gabime 5372d58adc comment 2018-01-12 14:09:07 +02:00
Gabi Melman 751520f0cf Merge pull request #610 from joaomoreno/fix609
Use Sleep in Windows instead of sleep_for
2018-01-11 23:09:38 +02:00
Joao Moreno 357a63d914 fix spdlog namespace 2018-01-11 21:58:02 +01:00
Joao Moreno a938045135 use Sleep in Windows instead of sleep_for
fixes #609
2018-01-11 14:50:47 +01:00
Gabi Melman 32177aa77a Merge pull request #604 from sam-lunt/improve-macros
Ensure marcos always expand to expressions
2018-01-03 18:05:25 +02:00
Gabi Melman ce1df17262 Merge pull request #605 from sam-lunt/add-flush-on
Add global flush_on function
2018-01-03 18:00:08 +02:00
Sam Lunt 9f8413308a add global flush_on function 2018-01-03 09:36:09 -06:00
Sam Lunt f25f0e0e40 add (void)0 when logging is disabled 2018-01-03 09:07:58 -06:00
Gabi Melman a2890f2778 Merge pull request #596 from Broekman/master
Issue fix for spdlog #595. Conversion warning.
2017-12-26 21:22:08 +02:00
Stefan Broekman de4644b44a Issue fix for spdlog #595. Conversion warning.
See: https://github.com/gabime/spdlog/issues/595

On line 85 in file sinks/wincolor_sink.h:
back_color &= ~(FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE |
FOREGROUND_INTENSITY);

'back_color' is of type 'WORD' (unsigned short) whereas a bitwise
complement/NOT returns an int. This results in a conversion warning with
-Wconversion enabled.

85:20: warning: conversion to 'WORD {aka short unsigned int}' from 'int'
may alter its value [-Wconversion] back_color &= ~(FOREGROUND_RED |
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY);

Possible solution:
We know that the result of ~(FOREGROUND_RED | FOREGROUND_GREEN |
FOREGROUND_BLUE | FOREGROUND_INTENSITY) is always within the limits of
an unsigned short so a simple cast should suffice (correct me if I'm
wrong):

back_color &= static_cast<unsigned short>(~(FOREGROUND_RED |
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY));
2017-12-26 19:23:29 +01:00
Gabi Melman 03db102375 Update README.md 2017-12-26 13:26:04 +02:00
gabime 3d967dd716 added catch license in tests folder 2017-12-24 19:37:54 +02:00
Gabi Melman b53d207f44 Update file_helper.h 2017-12-23 11:43:41 +02:00
Gabi Melman fde12195ee Update file_helper.h 2017-12-22 19:06:01 +02:00
gabime 4ca6991828 astyle 2017-12-22 18:55:19 +02:00
gabime 813dcbcf63 version 0.16.2 2017-12-22 18:50:08 +02:00
gabime 7663f58379 Fixed file_helper::split_by_extenstion tests for gcc 2017-12-22 18:48:02 +02:00
gabime 8e3f968ba4 Fixed file_helper::split_by_extenstion and added more tests for it 2017-12-22 18:41:03 +02:00
gabime f695e536dd Fixed file_helper::split_by_extenstion and added more tests for it 2017-12-22 18:37:51 +02:00
gabime f257e4ea8c gitignore tests/logs 2017-12-22 18:36:54 +02:00
gabime 0ed3e4cf76 Merge branch 'master' of https://github.com/gabime/spdlog 2017-12-22 14:38:54 +02:00
gabime 6d355fd602 report about unknown excepptions before rethrow 2017-12-22 14:38:44 +02:00
Gabi Melman dd0b7b2d13 Merge pull request #590 from fcharlie/master
fix split_by_extenstion parse error extenstion
2017-12-22 12:50:52 +02:00
Force Charlie 42e5d98a48 fix split_by_extenstion parse error extenstion 2017-12-22 17:52:50 +08:00
Gabi Melman c060a10c10 update to version 0.16.1 2017-12-20 10:08:49 +02:00
Gabi Melman 79a3a633c7 uupdate version to 0.16.1 2017-12-20 10:07:50 +02:00
Gabi Melman 52dfd478d6 Merge pull request #584 from horar/master
Update version strings to 0.16.0
2017-12-20 10:02:17 +02:00
Gabi Melman 48eca46680 Merge pull request #586 from horar/fix/warnings
Solve compiler warning in tests
2017-12-20 09:50:34 +02:00
Ľubomír Carik f93277d271 Solve compiler warning in tests
Signed-off-by: Ľubomír Carik <Lubomir.Carik@anritsu.com>
2017-12-20 04:34:08 +01:00
Ľubomír Carik dda8af0092 Update version strings to 0.16.0
Signed-off-by: Ľubomír Carik <Lubomir.Carik@anritsu.com>
2017-12-20 03:43:47 +01:00
gabime ed5498a2e9 report unexected exception types 2017-12-20 00:29:15 +02:00