Merge pull request #1275 from flopp/spelling

Fix some spelling errors.
This commit is contained in:
Gabi Melman 2019-10-19 11:09:11 +03:00 committed by GitHub
commit 1472048b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 20 additions and 20 deletions

View File

@ -121,7 +121,7 @@ target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
#--------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------
# Use fmt package if using exertnal fmt # Use fmt package if using external fmt
#--------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------
if(SPDLOG_FMT_EXTERNAL) if(SPDLOG_FMT_EXTERNAL)
if (NOT TARGET fmt::fmt) if (NOT TARGET fmt::fmt)
@ -133,7 +133,7 @@ if(SPDLOG_FMT_EXTERNAL)
target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL) target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
target_link_libraries(spdlog_header_only INTERFACE fmt::fmt) target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
set(PKG_CONFIG_REQUIRES fmt) # add dependecy to pkg-config set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
endif() endif()
if(SPDLOG_WCHAR_SUPPORT) if(SPDLOG_WCHAR_SUPPORT)

View File

@ -6,7 +6,7 @@
// //
// Async logging using global thread pool // Async logging using global thread pool
// All loggers created here share same global thread pool. // All loggers created here share same global thread pool.
// Each log message is pushed to a queue along withe a shared pointer to the // Each log message is pushed to a queue along with a shared pointer to the
// logger. // logger.
// If a logger deleted while having pending messages in the queue, it's actual // If a logger deleted while having pending messages in the queue, it's actual
// destruction will defer // destruction will defer

View File

@ -1,7 +1,7 @@
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors. // Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
// Distributed under the MIT License (http://opensource.org/licenses/MIT) // Distributed under the MIT License (http://opensource.org/licenses/MIT)
// cirucal q view of std::vector. // circular q view of std::vector.
#pragma once #pragma once
#include <vector> #include <vector>

View File

@ -119,7 +119,7 @@ SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension
return std::make_tuple(fname, filename_t()); return std::make_tuple(fname, filename_t());
} }
// treat casese like "/etc/rc.d/somelogfile or "/abc/.hiddenfile" // treat cases like "/etc/rc.d/somelogfile or "/abc/.hiddenfile"
auto folder_index = fname.rfind(details::os::folder_sep); auto folder_index = fname.rfind(details::os::folder_sep);
if (folder_index != filename_t::npos && folder_index >= ext_index - 1) if (folder_index != filename_t::npos && folder_index >= ext_index - 1)
{ {

View File

@ -81,7 +81,7 @@ int pid() SPDLOG_NOEXCEPT;
// Source: https://github.com/agauniyal/rang/ // Source: https://github.com/agauniyal/rang/
bool is_color_terminal() SPDLOG_NOEXCEPT; bool is_color_terminal() SPDLOG_NOEXCEPT;
// Detrmine if the terminal attached // Determine if the terminal attached
// Source: https://github.com/agauniyal/rang/ // Source: https://github.com/agauniyal/rang/
bool in_terminal(FILE *file) SPDLOG_NOEXCEPT; bool in_terminal(FILE *file) SPDLOG_NOEXCEPT;

View File

@ -596,7 +596,7 @@ public:
#ifdef _WIN32 #ifdef _WIN32
int total_minutes = get_cached_offset(msg, tm_time); int total_minutes = get_cached_offset(msg, tm_time);
#else #else
// No need to chache under gcc, // No need to cache under gcc,
// it is very fast (already stored in tm.tm_gmtoff) // it is very fast (already stored in tm.tm_gmtoff)
(void)(msg); (void)(msg);
int total_minutes = os::utc_minutes_offset(tm_time); int total_minutes = os::utc_minutes_offset(tm_time);

View File

@ -254,10 +254,10 @@ SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex()
return tp_mutex_; return tp_mutex_;
} }
SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_regsistration) SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration)
{ {
std::lock_guard<std::mutex> lock(logger_map_mutex_); std::lock_guard<std::mutex> lock(logger_map_mutex_);
automatic_registration_ = automatic_regsistration; automatic_registration_ = automatic_registration;
} }
SPDLOG_INLINE registry &registry::instance() SPDLOG_INLINE registry &registry::instance()

View File

@ -77,7 +77,7 @@ public:
std::recursive_mutex &tp_mutex(); std::recursive_mutex &tp_mutex();
void set_automatic_registration(bool automatic_regsistration); void set_automatic_registration(bool automatic_registration);
static registry &instance(); static registry &instance();

View File

@ -90,7 +90,7 @@ SPDLOG_INLINE const std::string &logger::name() const
} }
// set formatting for the sinks in this logger. // set formatting for the sinks in this logger.
// each sink will get a seperate instance of the formatter object. // each sink will get a separate instance of the formatter object.
SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f) SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f)
{ {
for (auto it = sinks_.begin(); it != sinks_.end(); ++it) for (auto it = sinks_.begin(); it != sinks_.end(); ++it)

View File

@ -303,7 +303,7 @@ public:
const std::string &name() const; const std::string &name() const;
// set formatting for the sinks in this logger. // set formatting for the sinks in this logger.
// each sink will get a seperate instance of the formatter object. // each sink will get a separate instance of the formatter object.
void set_formatter(std::unique_ptr<formatter> f); void set_formatter(std::unique_ptr<formatter> f);
void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local); void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local);

View File

@ -95,7 +95,7 @@ protected:
base_sink<Mutex>::formatter_->format(msg, formatted); base_sink<Mutex>::formatter_->format(msg, formatted);
file_helper_.write(formatted); file_helper_.write(formatted);
// Do the cleaning ony at the end because it might throw on failure. // Do the cleaning only at the end because it might throw on failure.
if (should_rotate && max_files_ > 0) if (should_rotate && max_files_ > 0)
{ {
delete_old_(); delete_old_();

View File

@ -92,9 +92,9 @@ SPDLOG_INLINE void shutdown()
details::registry::instance().shutdown(); details::registry::instance().shutdown();
} }
SPDLOG_INLINE void set_automatic_registration(bool automatic_registation) SPDLOG_INLINE void set_automatic_registration(bool automatic_registration)
{ {
details::registry::instance().set_automatic_registration(automatic_registation); details::registry::instance().set_automatic_registration(automatic_registration);
} }
SPDLOG_INLINE std::shared_ptr<spdlog::logger> default_logger() SPDLOG_INLINE std::shared_ptr<spdlog::logger> default_logger()

View File

@ -100,7 +100,7 @@ void drop_all();
void shutdown(); void shutdown();
// Automatic registration of loggers when using spdlog::create() or spdlog::create_async // Automatic registration of loggers when using spdlog::create() or spdlog::create_async
void set_automatic_registration(bool automatic_registation); void set_automatic_registration(bool automatic_registration);
// API for using default logger (stdout_color_mt), // API for using default logger (stdout_color_mt),
// e.g: spdlog::info("Message {}", 1); // e.g: spdlog::info("Message {}", 1);

View File

@ -21,7 +21,7 @@ dep_list += dependency('threads')
# Check for FMT # Check for FMT
if get_option('external_fmt') if get_option('external_fmt')
if not meson.version().version_compare('>=0.49.0') if not meson.version().version_compare('>=0.49.0')
warning('Finding fmt can fail wit meson versions before 0.49.0') warning('Finding fmt can fail with meson versions before 0.49.0')
endif endif
dep_list += dependency('fmt') dep_list += dependency('fmt')
compile_args += '-DSPDLOG_FMT_EXTERNAL' compile_args += '-DSPDLOG_FMT_EXTERNAL'

View File

@ -40,7 +40,7 @@ TEST_CASE("disable param evaluation", "[macros]")
SPDLOG_TRACE("Test message {}", throw std::runtime_error("Should not be evaluated")); SPDLOG_TRACE("Test message {}", throw std::runtime_error("Should not be evaluated"));
} }
// ensure that even if right macro level is on- don't eavluate if the logger's level is not high enough // ensure that even if right macro level is on- don't evaluate if the logger's level is not high enough
TEST_CASE("disable param evaluation2", "[macros]") TEST_CASE("disable param evaluation2", "[macros]")
{ {
auto logger = std::make_shared<spdlog::logger>("test-macro"); auto logger = std::make_shared<spdlog::logger>("test-macro");

View File

@ -9,7 +9,7 @@ TEST_CASE("register_drop", "[registry]")
spdlog::drop_all(); spdlog::drop_all();
spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name); spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name);
REQUIRE(spdlog::get(tested_logger_name) != nullptr); REQUIRE(spdlog::get(tested_logger_name) != nullptr);
// Throw if registring existing name // Throw if registering existing name
REQUIRE_THROWS_AS(spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name), spdlog::spdlog_ex); REQUIRE_THROWS_AS(spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name), spdlog::spdlog_ex);
} }
@ -19,7 +19,7 @@ TEST_CASE("explicit register", "[registry]")
auto logger = std::make_shared<spdlog::logger>(tested_logger_name, std::make_shared<spdlog::sinks::null_sink_st>()); auto logger = std::make_shared<spdlog::logger>(tested_logger_name, std::make_shared<spdlog::sinks::null_sink_st>());
spdlog::register_logger(logger); spdlog::register_logger(logger);
REQUIRE(spdlog::get(tested_logger_name) != nullptr); REQUIRE(spdlog::get(tested_logger_name) != nullptr);
// Throw if registring existing name // Throw if registering existing name
REQUIRE_THROWS_AS(spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name), spdlog::spdlog_ex); REQUIRE_THROWS_AS(spdlog::create<spdlog::sinks::null_sink_mt>(tested_logger_name), spdlog::spdlog_ex);
} }
#endif #endif