From 9c2400c9cbad4cb2e6a88443188e13cfefa1cacb Mon Sep 17 00:00:00 2001 From: Anuradha Dissanayake Date: Tue, 14 Feb 2017 23:02:31 +1300 Subject: [PATCH 01/14] Fixes for type conversion warnings in MSVC warning level 4. --- src/easylogging++.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/easylogging++.cc b/src/easylogging++.cc index 9208a9abc..efe75ec02 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -1116,7 +1116,7 @@ base::type::string_t DateTime::formatTime(unsigned long long time, base::Timesta if (base::consts::kTimeFormats[i].value == 1000.0f && time / 1000.0f < 1.9f) { break; } - time /= base::consts::kTimeFormats[i].value; + time /= static_cast(base::consts::kTimeFormats[i].value); unit = base::consts::kTimeFormats[i + 1].unit; } base::type::stringstream_t ss; @@ -1907,7 +1907,7 @@ void VRegistry::setModules(const char* modules) { isLevel = false; isMod = true; if (!ss.str().empty() && level != -1) { - insert(ss, level); + insert(ss, static_cast(level)); ss.str(std::string("")); level = -1; } @@ -1924,7 +1924,7 @@ void VRegistry::setModules(const char* modules) { } } if (!ss.str().empty() && level != -1) { - insert(ss, level); + insert(ss, static_cast(level)); } } @@ -1951,9 +1951,9 @@ void VRegistry::setFromArgs(const base::utils::CommandLineArgs* commandLineArgs) commandLineArgs->hasParam("-V") || commandLineArgs->hasParam("--VERBOSE")) { setLevel(base::consts::kMaxVerboseLevel); } else if (commandLineArgs->hasParamWithValue("--v")) { - setLevel(atoi(commandLineArgs->getParamValue("--v"))); + setLevel(static_cast(atoi(commandLineArgs->getParamValue("--v")))); } else if (commandLineArgs->hasParamWithValue("--V")) { - setLevel(atoi(commandLineArgs->getParamValue("--V"))); + setLevel(static_cast(atoi(commandLineArgs->getParamValue("--V")))); } else if ((commandLineArgs->hasParamWithValue("-vmodule")) && vModulesEnabled()) { setModules(commandLineArgs->getParamValue("-vmodule")); } else if (commandLineArgs->hasParamWithValue("-VMODULE") && vModulesEnabled()) { From f8837a44de84e5e72d024ced5fd801f93277f029 Mon Sep 17 00:00:00 2001 From: Anuradha Dissanayake Date: Tue, 14 Feb 2017 23:07:26 +1300 Subject: [PATCH 02/14] Fix for MSVC /W4 level warning: "assignment in conditional expression" --- src/easylogging++.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/easylogging++.cc b/src/easylogging++.cc index efe75ec02..e8b6dd88c 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -208,7 +208,7 @@ bool Configurations::parseFromFile(const std::string& configurationFile, Configu // We initial assertion with true because if we have assertion diabled, we want to pass this // check and if assertion is enabled we will have values re-assigned any way. bool assertionPassed = true; - ELPP_ASSERT((assertionPassed = base::utils::File::pathExists(configurationFile.c_str(), true)), + ELPP_ASSERT((assertionPassed = base::utils::File::pathExists(configurationFile.c_str(), true)) == true, "Configuration file [" << configurationFile << "] does not exist!"); if (!assertionPassed) { return false; From 9eccfa084aeba425efd3b38b40034b779d7028b5 Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Wed, 15 Feb 2017 16:11:23 +1100 Subject: [PATCH 03/14] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16c5d4734..d4701b2e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## [Unreleased] +### Fixed + - Fixes for /W4 level warnings generated in MSVC compile (Thanks to [Falconne](https://github.com/Falconne)) + ## [9.94.0] - 14-02-2017 ### Fixed - Fixed performance tracking time unit and calculations From 3715b75919f93f5ebc7112adc3cb243535814ae6 Mon Sep 17 00:00:00 2001 From: mkhan Date: Thu, 16 Feb 2017 16:50:29 +1100 Subject: [PATCH 04/14] tool release --- tools/release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index ec392063b..67813b9df 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -60,6 +60,7 @@ if [ "$confirm" = "y" ]; then sed -i '' -e "s/\$currentVersion = \"$CURR_VERSION\"*/\$currentVersion = \"$NEW_VERSION\"/g" $2/version.php sed -i '' -e "s/\$releaseDate = \"$CURR_RELEASE_DATE\"*/\$releaseDate = \"$NEW_RELEASE_DATE\"/g" $2/version.php sed -i '' -e "s/$CURR_RELEASE_DATE/$NEW_RELEASE_DATE/g" $2/version.php + sed -i '' -e "s/$CURR_VERSION \($CURR_RELEASE_DATE\)/$NEW_VERSION \($NEW_RELEASE_DATE\)/g" $2/index.html sed -i '' -e "s/v$CURR_VERSION/v$NEW_VERSION/g" $1/README.md sed -i '' -e "s/easyloggingpp_$CURR_VERSION.zip/easyloggingpp_$NEW_VERSION.zip/g" $1/README.md if [ -f "easyloggingpp_v$NEW_VERSION.zip" ]; then @@ -74,8 +75,8 @@ if [ "$confirm" = "y" ]; then cp $1/LICENCE LICENCE.txt zip easyloggingpp_v$NEW_VERSION.zip easylogging++.h easylogging++.cc LICENCE.txt CHANGELOG.txt tar -pczf easyloggingpp_v$NEW_VERSION.tar.gz easylogging++.h easylogging++.cc LICENCE.txt CHANGELOG.txt - mv easyloggingpp_v$NEW_VERSION.zip $2/releases/ - mv easyloggingpp_v$NEW_VERSION.tar.gz $2/releases/ + mv easyloggingpp_v$NEW_VERSION.zip $2/ + mv easyloggingpp_v$NEW_VERSION.tar.gz $2/ rm easylogging++.h easylogging++.cc CHANGELOG.txt LICENCE.txt echo "\n---------- PLEASE CHANGE CMakeLists.txt MANUALLY ----------- \n" fi From 53d4dcefbe853f079e9d17b21b9dc364049ba121 Mon Sep 17 00:00:00 2001 From: mkhan Date: Thu, 16 Feb 2017 16:55:08 +1100 Subject: [PATCH 05/14] ver --- tools/release.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 67813b9df..d47644583 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -57,10 +57,7 @@ if [ "$confirm" = "y" ]; then if [ -f "$1/src/easylogging++.cc.orig" ];then rm $1/src/easylogging++.cc.orig fi - sed -i '' -e "s/\$currentVersion = \"$CURR_VERSION\"*/\$currentVersion = \"$NEW_VERSION\"/g" $2/version.php - sed -i '' -e "s/\$releaseDate = \"$CURR_RELEASE_DATE\"*/\$releaseDate = \"$NEW_RELEASE_DATE\"/g" $2/version.php - sed -i '' -e "s/$CURR_RELEASE_DATE/$NEW_RELEASE_DATE/g" $2/version.php - sed -i '' -e "s/$CURR_VERSION \($CURR_RELEASE_DATE\)/$NEW_VERSION \($NEW_RELEASE_DATE\)/g" $2/index.html + sed -i '' -e "s/$CURR_VERSION ($CURR_RELEASE_DATE)/$NEW_VERSION ($NEW_RELEASE_DATE)/g" $2/index.html sed -i '' -e "s/v$CURR_VERSION/v$NEW_VERSION/g" $1/README.md sed -i '' -e "s/easyloggingpp_$CURR_VERSION.zip/easyloggingpp_$NEW_VERSION.zip/g" $1/README.md if [ -f "easyloggingpp_v$NEW_VERSION.zip" ]; then From eb5002dbe3ffbed8c8bd962148fffd77aa291bc2 Mon Sep 17 00:00:00 2001 From: mkhan Date: Thu, 16 Feb 2017 16:59:22 +1100 Subject: [PATCH 06/14] linkf --- CHANGELOG.md | 1 + LICENCE | 2 +- src/easylogging++.cc | 2 +- src/easylogging++.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4701b2e7..15be87e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Fixed - Fixes for /W4 level warnings generated in MSVC compile (Thanks to [Falconne](https://github.com/Falconne)) + - Fixed links ## [9.94.0] - 14-02-2017 ### Fixed diff --git a/LICENCE b/LICENCE index aa4fec762..2c8998dd4 100644 --- a/LICENCE +++ b/LICENCE @@ -3,7 +3,7 @@ The MIT License (MIT) Copyright (c) 2017 muflihun.com https://github.com/muflihun/ -https://labs.muflihun.com +https://muflihun.github.io https://muflihun.com Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/src/easylogging++.cc b/src/easylogging++.cc index e8b6dd88c..2a46da439 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -10,7 +10,7 @@ // http://labs.muflihun.com/easyloggingpp/licence.php // // https://github.com/muflihun/easyloggingpp -// http://labs.muflihun.com/easyloggingpp +// https://muflihun.github.io/easyloggingpp // http://muflihun.com // diff --git a/src/easylogging++.h b/src/easylogging++.h index 7fa0e38c5..bf4a1bd48 100644 --- a/src/easylogging++.h +++ b/src/easylogging++.h @@ -10,7 +10,7 @@ // http://labs.muflihun.com/easyloggingpp/licence.php // // https://github.com/muflihun/easyloggingpp -// http://labs.muflihun.com/easyloggingpp +// https://muflihun.github.io/easyloggingpp // http://muflihun.com // #ifndef EASYLOGGINGPP_H From 9db475ff64d37f046ce65aa0440d6e69e6f0218a Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Sun, 19 Feb 2017 11:14:18 +1100 Subject: [PATCH 07/14] see changelog for changes --- CHANGELOG.md | 6 +++++- src/easylogging++.cc | 6 +++--- src/easylogging++.h | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4701b2e7..e5a60a8a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## [Unreleased] ### Fixed - - Fixes for /W4 level warnings generated in MSVC compile (Thanks to [Falconne](https://github.com/Falconne)) + - Fixes for `/W4` level warnings generated in MSVC compile (Thanks to [Falconne](https://github.com/Falconne)) + - Fixes removing default logger if other than `default` + +### Changes + - Changed `TypedConfiguration` destructor to virtual ## [9.94.0] - 14-02-2017 ### Fixed diff --git a/src/easylogging++.cc b/src/easylogging++.cc index e8b6dd88c..cb5abfdec 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -1727,7 +1727,7 @@ void TypedConfigurations::insertFile(Level level, const std::string& fullFilenam create(m_filenameMap.empty() && m_fileStreamMap.empty() ? Level::Global : level); } -bool TypedConfigurations::unsafeValidateFileRolling(Level level, const PreRollOutCallback& PreRollOutCallback) { +bool TypedConfigurations::unsafeValidateFileRolling(Level level, const PreRollOutCallback& preRollOutCallback) { base::type::fstream_t* fs = unsafeGetConfigByRef(level, &m_fileStreamMap, "fileStream").get(); if (fs == nullptr) { return true; @@ -1739,7 +1739,7 @@ bool TypedConfigurations::unsafeValidateFileRolling(Level level, const PreRollOu ELPP_INTERNAL_INFO(1, "Truncating log file [" << fname << "] as a result of configurations for level [" << LevelHelper::convertToString(level) << "]"); fs->close(); - PreRollOutCallback(fname.c_str(), currFileSize); + preRollOutCallback(fname.c_str(), currFileSize); fs->open(fname, std::fstream::out | std::fstream::trunc); return true; } @@ -1823,7 +1823,7 @@ Logger* RegisteredLoggers::get(const std::string& id, bool forceCreation) { } bool RegisteredLoggers::remove(const std::string& id) { - if (id == "default") { + if (id == base::consts::kDefaultLoggerId) { return false; } Logger* logger = base::utils::Registry::get(id); diff --git a/src/easylogging++.h b/src/easylogging++.h index 7fa0e38c5..d1b5159ac 100644 --- a/src/easylogging++.h +++ b/src/easylogging++.h @@ -1944,7 +1944,7 @@ class TypedConfigurations : public base::threading::ThreadSafe { TypedConfigurations(const TypedConfigurations& other); - ~TypedConfigurations(void) { + virtual ~TypedConfigurations(void) { } const Configurations* configurations(void) const { @@ -2055,11 +2055,11 @@ class TypedConfigurations : public base::threading::ThreadSafe { unsigned long getULong(std::string confVal); std::string resolveFilename(const std::string& filename); void insertFile(Level level, const std::string& fullFilename); - bool unsafeValidateFileRolling(Level level, const PreRollOutCallback& PreRollOutCallback); + bool unsafeValidateFileRolling(Level level, const PreRollOutCallback& preRollOutCallback); - inline bool validateFileRolling(Level level, const PreRollOutCallback& PreRollOutCallback) { + inline bool validateFileRolling(Level level, const PreRollOutCallback& preRollOutCallback) { base::threading::ScopedLock scopedLock(lock()); - return unsafeValidateFileRolling(level, PreRollOutCallback); + return unsafeValidateFileRolling(level, preRollOutCallback); } }; /// @brief Class that keeps record of current line hit for occasional logging From 6f867c6660bf2b125e17de055da0dba7c4ef437f Mon Sep 17 00:00:00 2001 From: Majid Date: Mon, 20 Feb 2017 11:38:36 +1100 Subject: [PATCH 08/14] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index db68e87ee..b7b00d1f9 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ [![Version](https://img.shields.io/github/release/muflihun/easyloggingpp.svg)](https://github.com/muflihun/easyloggingpp/releases/latest) +[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/muflihun/easyloggingpp/blob/master/LICENCE) + [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/MuflihunDotCom/25) [![Downloads](https://img.shields.io/github/downloads/muflihun/easyloggingpp/total.svg)](https://github.com/muflihun/easyloggingpp/releases/latest) From a31a6805d0eabdb8006dea1bb9c40d77f6b78316 Mon Sep 17 00:00:00 2001 From: Majid Date: Mon, 20 Feb 2017 11:59:00 +1100 Subject: [PATCH 09/14] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b7b00d1f9..19b77e40b 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ [![Downloads](https://img.shields.io/github/downloads/muflihun/easyloggingpp/total.svg)](https://github.com/muflihun/easyloggingpp/releases/latest) +[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/rwDXGcnP1IoCKXrJ) + ### Quick Links [![download] Latest Release](https://github.com/muflihun/easyloggingpp/releases/latest) From 8b4de98fab76855325b84288b030646913708f17 Mon Sep 17 00:00:00 2001 From: Majid Date: Wed, 22 Feb 2017 10:43:08 +1100 Subject: [PATCH 10/14] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19b77e40b..9dd4508ea 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,16 @@ [![Version](https://img.shields.io/github/release/muflihun/easyloggingpp.svg)](https://github.com/muflihun/easyloggingpp/releases/latest) +[![Canon.io](https://img.shields.io/badge/conan.io-easyloggingpp%2F9.94.0-green.svg?logo=data:image/png;base64%2CiVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAAA1VBMVEUAAABhlctjlstkl8tlmMtlmMxlmcxmmcxnmsxpnMxpnM1qnc1sn85voM91oM11oc1xotB2oc56pNF6pNJ2ptJ8ptJ8ptN9ptN8p9N5qNJ9p9N9p9R8qtOBqdSAqtOAqtR%2BrNSCrNJ/rdWDrNWCsNWCsNaJs9eLs9iRvNuVvdyVv9yXwd2Zwt6axN6dxt%2Bfx%2BChyeGiyuGjyuCjyuGly%2BGlzOKmzOGozuKoz%2BKqz%2BOq0OOv1OWw1OWw1eWx1eWy1uay1%2Baz1%2Baz1%2Bez2Oe02Oe12ee22ujUGwH3AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfgBQkREyOxFIh/AAAAiklEQVQI12NgAAMbOwY4sLZ2NtQ1coVKWNvoc/Eq8XDr2wB5Ig62ekza9vaOqpK2TpoMzOxaFtwqZua2Bm4makIM7OzMAjoaCqYuxooSUqJALjs7o4yVpbowvzSUy87KqSwmxQfnsrPISyFzWeWAXCkpMaBVIC4bmCsOdgiUKwh3JojLgAQ4ZCE0AMm2D29tZwe6AAAAAElFTkSuQmCC)](http://www.conan.io/source/easyloggingpp/9.94.0/memsharded/testing) + +[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/rwDXGcnP1IoCKXrJ) + [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/muflihun/easyloggingpp/blob/master/LICENCE) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/MuflihunDotCom/25) [![Downloads](https://img.shields.io/github/downloads/muflihun/easyloggingpp/total.svg)](https://github.com/muflihun/easyloggingpp/releases/latest) -[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/rwDXGcnP1IoCKXrJ) - ### Quick Links [![download] Latest Release](https://github.com/muflihun/easyloggingpp/releases/latest) From 310350d63cc9e24d9e56b65f2be1046dab101ba8 Mon Sep 17 00:00:00 2001 From: Majid Date: Sat, 25 Feb 2017 08:03:59 +1100 Subject: [PATCH 11/14] Update README.md --- README.md | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 9dd4508ea..bb031a9fb 100644 --- a/README.md +++ b/README.md @@ -106,34 +106,39 @@ # Introduction -Easylogging++ is single header, feature-rich, efficient logging library for C++ applications. It has been written keeping three things in mind: performance, management (setup, configure, logging, simplicity) and portability. Its highly configurable and extremely useful for small to large sized projects. +Easylogging++ is single header efficient logging library for C++ applications. It is extremely powerful, highly extendable and configurable to user's requirements. It provides ability to [write your own sinks](https://github.com/muflihun/easyloggingpp/tree/master/samples/send-to-network) (referred to as `LogDispatchCallback`). Currently used by hundreds of open-source projects. + This manual is for Easylogging++ v9.94.0. For other versions please refer to corresponding [release](https://github.com/muflihun/easyloggingpp/releases) on github. [![top] Goto Top](#table-of-contents) ### Why yet another library -If you are working on a small utility or large project in C++, this library can be handy. Its based on single header and does not require linking or installation. You can import into your project as if its part of your project. This library has been designed with various thoughts in mind (i.e, portability, performance, usability, features and easy to setup). +If you are working on a small utility or large project in C++, this library can be handy. Its based on single header and only requires to link to single source file. (Originally it was header-only and was changed to use source file in [issue #445](https://github.com/muflihun/easyloggingpp/issues/445). You can still use header-only in [v9.89](https://github.com/muflihun/easyloggingpp/releases/tag/9.89)). + +This library has been designed with various thoughts in mind (i.e, portability, performance, usability, features and easy to setup). -Why yet another library? Well, answer is pretty straight forward, use it as if you wrote it so you can fix issues (if any) as you go or raise them on github. In addition to that, I have not seen any logging library based on single-header with such a design where you can configure on the go and get the same performance. I have seen other single-header logging libraries for C++ but either they use external libraries, e.g, boost, Qt to support certain features like threading, regular expression or date etc. This library has everything built-in to prevent usage of external libraries, not that I don't like those libraries, in fact I love them, but because not all projects use these libraries, I couldn't take risk of depending on them. +Why yet another library? Well, answer is pretty straight forward, use it as you wrote it so you can fix issues (if any) as you go or raise them on github. In addition to that, I personally have not seen any logging library based on single-header with such a design where you can configure on the go, extend it to your needs and get fast performance. I have seen other single-header logging libraries for C++ but either they use external libraries, e.g, boost or Qt to support certain features like threading, regular expression or date etc. This library has everything built-in to prevent usage of external libraries, not that I don't like those libraries, in fact I love them, but because not all projects use these libraries, I couldn't take risk of depending on them. [![top] Goto Top](#table-of-contents) ### Features at a glance Easylogging++ is feature-rich containing many features that both typical and advanced developer will require while writing a software; - * Highly configurable + * [Highly configurable](#configuration) + * [Extendable](#log-dispatch-callback) * Extremely fast - * Thread and type safe - * Cross-platform - * Custom log patterns - * Conditional and occasional logging - * Performance tracking - * Verbose logging - * Crash handling - * Helper CHECK macros - * STL logging - * Third-party library logging (Qt, boost, wxWidgets etc) - * Extensible (Logging your own class or third-party class) - * And many more... + * [Thread](#multi-threading) and type safe + * [Cross-platform](#compatibility) + * [Custom log patterns](#logging-format-specifiers) + * [Conditional and occasional logging](#conditional-logging) + * [Performance tracking](#performance-tracking) + * [Verbose logging](#verbose-logging] + * [Crash handling](#crash-handling) + * [Helper CHECK macros](#check-macros) + * [STL logging](#stl-logging) + * [Send to Syslog](#syslog) + * [Third-party library logging (Qt, boost, wxWidgets etc)](#logging-third-party-class) + * [Extensible (Logging your own class or third-party class)](#logging-your-own-class) + * [And many more...](#extra-features) [![top] Goto Top](#table-of-contents) From 281f1c450987b2970f592eaf7041d3088e018dcf Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Sat, 25 Feb 2017 08:08:06 +1100 Subject: [PATCH 12/14] updated changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 557ed4664..2d02a8228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ - Fixed links - Fixes removing default logger if other than `default` +### Changes + - Changed documentation to mention `easylogging++.cc` in introduction and added links to features + ## [9.94.0] - 14-02-2017 ### Fixed - Fixed performance tracking time unit and calculations @@ -16,4 +19,4 @@ - Custom format specifier now has to return `std::string` instead - Merged `thread_name` with `thread` if thread name is available it's used otherwise ID is displayed -For older versions please refer to https://github.com/muflihun/easyloggingpp/tree/master/doc +For older versions please refer to [https://github.com/muflihun/easyloggingpp/tree/master/doc](https://github.com/muflihun/easyloggingpp/tree/master/doc) From d75be52778563e0fbb6c612b2051638d96bb4889 Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Sat, 25 Feb 2017 08:11:13 +1100 Subject: [PATCH 13/14] released script updated From 5b6678a92ab4550ff8ec9afd3a337f29522b369c Mon Sep 17 00:00:00 2001 From: Majid Khan Date: Sat, 25 Feb 2017 08:14:34 +1100 Subject: [PATCH 14/14] v9.94.1 --- CHANGELOG.md | 2 +- CMakeLists.txt | 4 ++-- README.md | 4 ++-- src/easylogging++.cc | 6 +++--- src/easylogging++.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d02a8228..f94657e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## [Unreleased] +## [9.94.1] - 25-02-2017 ### Fixed - Fixes for `/W4` level warnings generated in MSVC compile (Thanks to [Falconne](https://github.com/Falconne)) - Fixed links diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c1e0c222..6df20f72f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ project(Easyloggingpp CXX) option(test "Build all tests" OFF) set(ELPP_MAJOR_VERSION "9") -set(ELPP_MINOR_VERSION "93") -set(ELPP_PATCH_VERSION "0") +set(ELPP_MINOR_VERSION "94") +set(ELPP_PATCH_VERSION "1") set(ELPP_VERSION_STRING "${ELPP_MAJOR_VERSION}.${ELPP_MINOR_VERSION}.${ELPP_PATCH_VERSION}") set(ELPP_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in") diff --git a/README.md b/README.md index bb031a9fb..1b5c9f85d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![banner] -> **Manual For v9.94.0** +> **Manual For v9.94.1** [![Build Status (Develop)](https://img.shields.io/travis/muflihun/easyloggingpp/develop.svg)](https://travis-ci.org/muflihun/easyloggingpp) (`develop`) @@ -108,7 +108,7 @@ # Introduction Easylogging++ is single header efficient logging library for C++ applications. It is extremely powerful, highly extendable and configurable to user's requirements. It provides ability to [write your own sinks](https://github.com/muflihun/easyloggingpp/tree/master/samples/send-to-network) (referred to as `LogDispatchCallback`). Currently used by hundreds of open-source projects. -This manual is for Easylogging++ v9.94.0. For other versions please refer to corresponding [release](https://github.com/muflihun/easyloggingpp/releases) on github. +This manual is for Easylogging++ v9.94.1. For other versions please refer to corresponding [release](https://github.com/muflihun/easyloggingpp/releases) on github. [![top] Goto Top](#table-of-contents) diff --git a/src/easylogging++.cc b/src/easylogging++.cc index c2c577ac6..cf6958a31 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -1,7 +1,7 @@ // // Bismillah ar-Rahmaan ar-Raheem // -// Easylogging++ v9.94.0 +// Easylogging++ v9.94.1 // Cross-platform logging library for C++ applications // // Copyright (c) 2017 muflihun.com @@ -2969,11 +2969,11 @@ void Loggers::clearVModules(void) { // VersionInfo const std::string VersionInfo::version(void) { - return std::string("9.94.0"); + return std::string("9.94.1"); } /// @brief Release date of current version const std::string VersionInfo::releaseDate(void) { - return std::string("14-02-2017 0946hrs"); + return std::string("25-02-2017 0813hrs"); } } // namespace el diff --git a/src/easylogging++.h b/src/easylogging++.h index 230081411..1bb51ca91 100644 --- a/src/easylogging++.h +++ b/src/easylogging++.h @@ -1,7 +1,7 @@ // // Bismillah ar-Rahmaan ar-Raheem // -// Easylogging++ v9.94.0 +// Easylogging++ v9.94.1 // Single-header only, cross-platform logging library for C++ applications // // Copyright (c) 2017 muflihun.com