susumu.yata
null+****@clear*****
Mon Jul 1 10:35:17 JST 2013
susumu.yata 2013-07-01 10:35:17 +0900 (Mon, 01 Jul 2013) New Revision: fab66fef6bc50fe9c01183632df44dbb90b971c8 https://github.com/groonga/grnxx/commit/fab66fef6bc50fe9c01183632df44dbb90b971c8 Message: Remove grnxx::FlagsImpl::none(). Modified files: lib/grnxx/flags_impl.hpp lib/grnxx/logger.cpp lib/grnxx/logger.hpp lib/grnxx/string_builder.hpp lib/grnxx/string_format.hpp Modified: lib/grnxx/flags_impl.hpp (+0 -4) =================================================================== --- lib/grnxx/flags_impl.hpp 2013-07-01 10:23:59 +0900 (a71962a) +++ lib/grnxx/flags_impl.hpp 2013-07-01 10:35:17 +0900 (c5fe933) @@ -69,10 +69,6 @@ class FlagsImpl { return *this; } - // TODO: To be removed. - static constexpr FlagsImpl none() { - return FlagsImpl(0); - } static constexpr FlagsImpl define(Type flags) { return FlagsImpl(flags); } Modified: lib/grnxx/logger.cpp (+2 -2) =================================================================== --- lib/grnxx/logger.cpp 2013-07-01 10:23:59 +0900 (85709f9) +++ lib/grnxx/logger.cpp 2013-07-01 10:35:17 +0900 (3a00610) @@ -135,14 +135,14 @@ volatile bool LoggerSingleton::initialized_ = false; LoggerSingleton * volatile LoggerSingleton::instance_ = nullptr; Mutex LoggerSingleton::mutex_(MUTEX_UNLOCKED); -LoggerFlags Logger::flags_ = LoggerFlags::none(); +LoggerFlags Logger::flags_ = LOGGER_DEFAULT; int Logger::max_level_ = NOTICE_LOGGER; int Logger::backtrace_level_ = ERROR_LOGGER; Logger::Logger(const char *file, int line, const char *func, int level) : buf_(), builder_(buf_, (Logger::flags() & LOGGER_ENABLE_AUTO_RESIZE) ? - STRING_BUILDER_AUTO_RESIZE : StringBuilderFlags::none()), + STRING_BUILDER_AUTO_RESIZE : STRING_BUILDER_DEFAULT), file_(file), line_(line), func_(func), Modified: lib/grnxx/logger.hpp (+5 -3) =================================================================== --- lib/grnxx/logger.hpp 2013-07-01 10:23:59 +0900 (d461357) +++ lib/grnxx/logger.hpp 2013-07-01 10:35:17 +0900 (642a46f) @@ -46,14 +46,16 @@ enum LoggerLevel { class Logger; typedef FlagsImpl<Logger> LoggerFlags; +constexpr LoggerFlags LOGGER_DEFAULT = LoggerFlags::define(0x0000); + constexpr LoggerFlags LOGGER_WITH_DATE_TIME = LoggerFlags::define(0x0001); constexpr LoggerFlags LOGGER_WITH_LOCATION = LoggerFlags::define(0x0002); constexpr LoggerFlags LOGGER_WITH_LEVEL = LoggerFlags::define(0x0004); constexpr LoggerFlags LOGGER_WITH_ALL = LoggerFlags::define(0x0007); -constexpr LoggerFlags LOGGER_ENABLE_COUT = LoggerFlags::define(0x0100); -constexpr LoggerFlags LOGGER_ENABLE_CERR = LoggerFlags::define(0x0200); -constexpr LoggerFlags LOGGER_ENABLE_CLOG = LoggerFlags::define(0x0400); +constexpr LoggerFlags LOGGER_ENABLE_COUT = LoggerFlags::define(0x0100); +constexpr LoggerFlags LOGGER_ENABLE_CERR = LoggerFlags::define(0x0200); +constexpr LoggerFlags LOGGER_ENABLE_CLOG = LoggerFlags::define(0x0400); constexpr LoggerFlags LOGGER_ENABLE_AUTO_RESIZE = LoggerFlags::define(0x1000); Modified: lib/grnxx/string_builder.hpp (+7 -4) =================================================================== --- lib/grnxx/string_builder.hpp 2013-07-01 10:23:59 +0900 (b158dfb) +++ lib/grnxx/string_builder.hpp 2013-07-01 10:35:17 +0900 (ea14523) @@ -35,12 +35,15 @@ constexpr size_t STRING_BUILDER_BUF_SIZE_MIN = 64; class StringBuilder; typedef FlagsImpl<StringBuilder> StringBuilderFlags; +// Use the default settings. +constexpr StringBuilderFlags STRING_BUILDER_DEFAULT = + StringBuilderFlags::define(0x00); constexpr StringBuilderFlags STRING_BUILDER_AUTO_RESIZE = StringBuilderFlags::define(0x01); class StringBuilder { public: - explicit StringBuilder(StringBuilderFlags flags = StringBuilderFlags::none()) + explicit StringBuilder(StringBuilderFlags flags = STRING_BUILDER_DEFAULT) : buf_(), begin_(nullptr), end_(nullptr), @@ -49,11 +52,11 @@ class StringBuilder { failed_(false) {} explicit StringBuilder(size_t size, - StringBuilderFlags flags = StringBuilderFlags::none()); + StringBuilderFlags flags = STRING_BUILDER_DEFAULT); template <size_t T> explicit StringBuilder(char (&buf)[T], - StringBuilderFlags flags = StringBuilderFlags::none()) + StringBuilderFlags flags = STRING_BUILDER_DEFAULT) : buf_(), begin_(buf), end_(buf + T - 1), @@ -64,7 +67,7 @@ class StringBuilder { } StringBuilder(char *buf, size_t size, - StringBuilderFlags flags = StringBuilderFlags::none()) + StringBuilderFlags flags = STRING_BUILDER_DEFAULT) : buf_(), begin_(buf), end_(buf + size - 1), Modified: lib/grnxx/string_format.hpp (+1 -1) =================================================================== --- lib/grnxx/string_format.hpp 2013-07-01 10:23:59 +0900 (a1272f0) +++ lib/grnxx/string_format.hpp 2013-07-01 10:35:17 +0900 (6eabec7) @@ -99,7 +99,7 @@ StringBuilder &operator<<(StringBuilder &builder, char local_buf[STRING_BUILDER_BUF_SIZE_MIN]; const StringBuilderFlags local_flags = (alignment.width() >= sizeof(local_buf)) ? - STRING_BUILDER_AUTO_RESIZE : StringBuilderFlags::none(); + STRING_BUILDER_AUTO_RESIZE : STRING_BUILDER_DEFAULT; StringBuilder local_builder(local_buf, local_flags); local_builder << alignment.value(); -------------- next part -------------- HTML����������������������������...Download