[med-svn] [Git][med-team/spdlog][master] 4 commits: New upstream version 1.2.1
Michael R. Crusoe
gitlab at salsa.debian.org
Thu Nov 29 10:30:27 GMT 2018
Michael R. Crusoe pushed to branch master at Debian Med / spdlog
Commits:
d2aec18a by Michael R. Crusoe at 2018-11-29T07:54:24Z
New upstream version 1.2.1
- - - - -
ec205065 by Michael R. Crusoe at 2018-11-29T07:54:25Z
Update upstream source from tag 'upstream/1.2.1'
Update to upstream version '1.2.1'
with Debian dir 67731a56ec86e3cd0374d678850aa172f5d156a6
- - - - -
d831d4e5 by Michael R. Crusoe at 2018-11-29T07:54:25Z
New upstream version
- - - - -
d6325578 by Michael R. Crusoe at 2018-11-29T07:59:56Z
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- example/CMakeLists.txt
- example/example.cpp
- − example/logs/.gitignore
- include/spdlog/common.h
- include/spdlog/details/os.h
- include/spdlog/sinks/dist_sink.h
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+spdlog (1:1.2.1-1) unstable; urgency=medium
+
+ * New upstream version
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com> Wed, 28 Nov 2018 23:54:29 -0800
+
spdlog (1:1.2.0-1) unstable; urgency=medium
* New upstream release.
=====================================
example/CMakeLists.txt
=====================================
@@ -32,7 +32,13 @@ endif()
find_package(Threads REQUIRED)
add_executable(example example.cpp)
-target_link_libraries(example spdlog::spdlog Threads::Threads)
+if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+ find_library(log-lib log)
+ target_link_libraries(example spdlog::spdlog Threads::Threads log)
+else()
+ target_link_libraries(example spdlog::spdlog Threads::Threads)
+endif()
+
add_executable(multisink multisink.cpp)
target_link_libraries(multisink spdlog::spdlog Threads::Threads)
=====================================
example/example.cpp
=====================================
@@ -163,7 +163,6 @@ void async_example()
// {:n} - don't split the output to lines.
#include "spdlog/fmt/bin_to_hex.h"
-
void binary_example()
{
auto console = spdlog::get("console");
=====================================
example/logs/.gitignore deleted
=====================================
@@ -1 +0,0 @@
-*.txt
=====================================
include/spdlog/common.h
=====================================
@@ -85,17 +85,17 @@ static const char *level_names[] SPDLOG_LEVEL_NAMES;
static const char *short_level_names[]{"T", "D", "I", "W", "E", "C", "O"};
-inline const char *to_c_str(spdlog::level::level_enum l)
+inline const char *to_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
{
return level_names[l];
}
-inline const char *to_short_c_str(spdlog::level::level_enum l)
+inline const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
{
return short_level_names[l];
}
-inline spdlog::level::level_enum from_str(const std::string &name)
+inline spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT
{
static std::unordered_map<std::string, level_enum> name_to_level = // map string->level
{{level_names[0], level::trace}, // trace
=====================================
include/spdlog/details/os.h
=====================================
@@ -57,7 +57,7 @@ namespace spdlog {
namespace details {
namespace os {
-inline spdlog::log_clock::time_point now()
+inline spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT
{
#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
@@ -70,7 +70,7 @@ inline spdlog::log_clock::time_point now()
return log_clock::now();
#endif
}
-inline std::tm localtime(const std::time_t &time_tt)
+inline std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
@@ -83,13 +83,13 @@ inline std::tm localtime(const std::time_t &time_tt)
return tm;
}
-inline std::tm localtime()
+inline std::tm localtime() SPDLOG_NOEXCEPT
{
std::time_t now_t = time(nullptr);
return localtime(now_t);
}
-inline std::tm gmtime(const std::time_t &time_tt)
+inline std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
@@ -102,21 +102,11 @@ inline std::tm gmtime(const std::time_t &time_tt)
return tm;
}
-inline std::tm gmtime()
+inline std::tm gmtime() SPDLOG_NOEXCEPT
{
std::time_t now_t = time(nullptr);
return gmtime(now_t);
}
-inline bool operator==(const std::tm &tm1, const std::tm &tm2)
-{
- return (tm1.tm_sec == tm2.tm_sec && tm1.tm_min == tm2.tm_min && tm1.tm_hour == tm2.tm_hour && tm1.tm_mday == tm2.tm_mday &&
- tm1.tm_mon == tm2.tm_mon && tm1.tm_year == tm2.tm_year && tm1.tm_isdst == tm2.tm_isdst);
-}
-
-inline bool operator!=(const std::tm &tm1, const std::tm &tm2)
-{
- return !(tm1 == tm2);
-}
// eol definition
#if !defined(SPDLOG_EOL)
@@ -176,7 +166,7 @@ inline bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mod
return *fp == nullptr;
}
-inline int remove(const filename_t &filename)
+inline int remove(const filename_t &filename) SPDLOG_NOEXCEPT
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wremove(filename.c_str());
@@ -185,7 +175,7 @@ inline int remove(const filename_t &filename)
#endif
}
-inline int rename(const filename_t &filename1, const filename_t &filename2)
+inline int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT
{
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
return _wrename(filename1.c_str(), filename2.c_str());
@@ -195,7 +185,7 @@ inline int rename(const filename_t &filename1, const filename_t &filename2)
}
// Return if file exists
-inline bool file_exists(const filename_t &filename)
+inline bool file_exists(const filename_t &filename) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
#ifdef SPDLOG_WCHAR_FILENAMES
@@ -323,7 +313,7 @@ inline int utc_minutes_offset(const std::tm &tm = details::os::localtime())
// Return current thread id as size_t
// It exists because the std::this_thread::get_id() is much slower(especially
// under VS 2013)
-inline size_t _thread_id()
+inline size_t _thread_id() SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return static_cast<size_t>(::GetCurrentThreadId());
@@ -346,7 +336,7 @@ inline size_t _thread_id()
}
// Return current thread id as size_t (from thread local storage)
-inline size_t thread_id()
+inline size_t thread_id() SPDLOG_NOEXCEPT
{
#if defined(SPDLOG_DISABLE_TID_CACHING) || (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt) || \
(defined(__clang__) && !__has_feature(cxx_thread_local))
@@ -359,7 +349,7 @@ inline size_t thread_id()
// This is avoid msvc issue in sleep_for that happens if the clock changes.
// See https://github.com/gabime/spdlog/issues/609
-inline void sleep_for_millis(int milliseconds)
+inline void sleep_for_millis(int milliseconds) SPDLOG_NOEXCEPT
{
#if defined(_WIN32)
::Sleep(milliseconds);
@@ -396,7 +386,7 @@ inline int pid()
// Determine if the terminal supports colors
// Source: https://github.com/agauniyal/rang/
-inline bool is_color_terminal()
+inline bool is_color_terminal() SPDLOG_NOEXCEPT
{
#ifdef _WIN32
return true;
@@ -418,7 +408,7 @@ inline bool is_color_terminal()
// Detrmine if the terminal attached
// Source: https://github.com/agauniyal/rang/
-inline bool in_terminal(FILE *file)
+inline bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
{
#ifdef _WIN32
=====================================
include/spdlog/sinks/dist_sink.h
=====================================
@@ -69,7 +69,7 @@ protected:
void set_pattern_(const std::string &pattern) override
{
- set_formatter_(spdlog::make_unique<spdlog::pattern_formatter>(pattern));
+ set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
}
void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override
View it on GitLab: https://salsa.debian.org/med-team/spdlog/compare/b327d6d5c82b2b02d3db8af134a752315d2d9e50...d6325578434d673355c294ea00b4f13c621fafec
--
View it on GitLab: https://salsa.debian.org/med-team/spdlog/compare/b327d6d5c82b2b02d3db8af134a752315d2d9e50...d6325578434d673355c294ea00b4f13c621fafec
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181129/e4ec2cc6/attachment-0001.html>
More information about the debian-med-commit
mailing list