Module: check_mk Branch: master Commit: 0be2cd33efabd26ec21c067fc77d184a9ad7d8e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0be2cd33efabd2… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Nov 23 11:33:01 2017 +0100 Fixed namespace comments. Sort using-declarations. Change-Id: I71048dd4ce524c1092942cf61a74ad71fcf95c77 --- agents/windows/RotatingFileHandler.cc | 2 +- agents/windows/SettingsCollector.h | 4 ++-- agents/windows/stringutil.h | 2 +- livestatus/src/BitMask.h | 2 +- livestatus/src/LogCache.cc | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/StringUtils.h | 2 +- livestatus/src/TimeperiodsCache.cc | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/windows/RotatingFileHandler.cc b/agents/windows/RotatingFileHandler.cc index 30976c2..9a36828 100644 --- a/agents/windows/RotatingFileHandler.cc +++ b/agents/windows/RotatingFileHandler.cc @@ -32,8 +32,8 @@ using std::lock_guard; using std::mutex; using std::ofstream; using std::ostringstream; -using std::stringstream; using std::string; +using std::stringstream; // TODO: replace this old C based implementation with // std(::experimental)::filesystem as soon as we upgrade to a MinGW version diff --git a/agents/windows/SettingsCollector.h b/agents/windows/SettingsCollector.h index 43a76d8..d46852a 100644 --- a/agents/windows/SettingsCollector.h +++ b/agents/windows/SettingsCollector.h @@ -61,7 +61,7 @@ public: private: bool m_ClearPending; }; -} +} // namespace BlockMode namespace AddMode { @@ -142,6 +142,6 @@ private: GroupFunction _function; typename ContainerT::iterator _insert_pos; }; -} +} // namespace AddMode #endif // SETTINGS_COLLECTOR_H diff --git a/agents/windows/stringutil.h b/agents/windows/stringutil.h index c60f39d..c4a73d2 100644 --- a/agents/windows/stringutil.h +++ b/agents/windows/stringutil.h @@ -122,7 +122,7 @@ std::string to_string(const T &source) { str << source; return str.str(); } -} +} // namespace std #endif // _cplusplus < 201103L diff --git a/livestatus/src/BitMask.h b/livestatus/src/BitMask.h index 3e4fcb0..9724a99 100644 --- a/livestatus/src/BitMask.h +++ b/livestatus/src/BitMask.h @@ -54,7 +54,7 @@ struct is_bit_mask { // A helper template to make template definitions a bit shorter template <typename T> constexpr bool is_bit_mask_v = is_bit_mask<T>::value; -} // namespace +} // namespace mk template <typename Enum, typename = std::enable_if_t<mk::is_bit_mask_v<Enum>>> inline constexpr Enum operator&(Enum x, Enum y) { diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 11a72e6..c1f79e9 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -30,9 +30,9 @@ #include "Logger.h" #include "MonitoringCore.h" +using std::chrono::system_clock; using std::make_unique; using std::string; -using std::chrono::system_clock; namespace { // Check memory every N'th new message diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 515a1a8..b429fb7 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -40,8 +40,8 @@ #include <new> #include "cmc.h" using std::bad_alloc; -using std::unique_ptr; using std::to_string; +using std::unique_ptr; #else #include <memory> #include <vector> diff --git a/livestatus/src/StringUtils.h b/livestatus/src/StringUtils.h index 699d5f2..072d4af 100644 --- a/livestatus/src/StringUtils.h +++ b/livestatus/src/StringUtils.h @@ -60,6 +60,6 @@ std::pair<std::string, std::string> nextField( std::string ipv4ToString(in_addr_t ipv4_address); std::string portToString(in_port_t port); #endif -} // namespace +} // namespace mk #endif // StringUtils_h diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 9969419..f6f674b 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -29,11 +29,11 @@ #include <utility> #include "Logger.h" +using std::chrono::minutes; +using std::chrono::system_clock; using std::lock_guard; using std::mutex; using std::string; -using std::chrono::system_clock; -using std::chrono::minutes; extern timeperiod *timeperiod_list;