From: Piotrek Zadroga Date: Wed, 17 Apr 2024 08:05:34 +0000 (+0200) Subject: [#3319] recover C++14 namespace syntax X-Git-Tag: Kea-2.5.8~62 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=840486e20666dbc652d0c59d671b9e8104f90b03;p=thirdparty%2Fkea.git [#3319] recover C++14 namespace syntax --- diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h index 7953d9d285..b438454e92 100644 --- a/src/lib/util/buffer.h +++ b/src/lib/util/buffer.h @@ -16,7 +16,8 @@ #include -namespace isc::util { +namespace isc { +namespace util { /// @brief The @c InputBuffer class is a buffer abstraction for manipulating read-only data. /// @@ -569,6 +570,7 @@ private: /// @brief Type of pointers to output buffers. typedef boost::shared_ptr OutputBufferPtr; -} // namespace isc::util +} // namespace util +} // namespace isc #endif // BUFFER_H diff --git a/src/lib/util/str.h b/src/lib/util/str.h index 0db54e4c80..bd5587d717 100644 --- a/src/lib/util/str.h +++ b/src/lib/util/str.h @@ -19,7 +19,9 @@ #include -namespace isc::util::str { +namespace isc { +namespace util { +namespace str { /// @brief A Set of C++ Utilities for Manipulating Strings @@ -64,6 +66,7 @@ seekTrimmed(Iterator const& begin, Iterator end, uint8_t const trim_val) { while (end != begin && *(end - 1) == trim_val) { --end; } + return (end); } @@ -283,6 +286,8 @@ isPrintable(const std::vector& content); std::string dumpAsHex(const uint8_t* data, size_t length); -} // namespace isc::util::str +} // namespace str +} // namespace util +} // namespace isc #endif // KEA_UTIL_STR_H