You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2020/05/14 20:19:59 UTC
[trafficserver] 02/02: Updated indentation with latest clang-format
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 748804d68e451c00736440ee183811219433739d
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Thu May 14 14:19:40 2020 -0600
Updated indentation with latest clang-format
---
include/tscore/ArgParser.h | 6 +++++-
include/tscore/CryptoHash.h | 6 +++++-
include/tscore/History.h | 6 +++++-
include/tscore/IntrusivePtr.h | 8 ++++++--
include/tscore/IpMap.h | 6 ++++--
include/tscore/Ptr.h | 12 ++++++++++--
include/tscore/Scalar.h | 24 ++++++++++++++++++------
include/tscore/TsBuffer.h | 15 ++++++++++-----
include/tscore/ink_memory.h | 6 +++++-
include/tscpp/util/IntrusiveDList.h | 16 ++++++++++++----
include/tscpp/util/MemSpan.h | 11 ++++++++---
include/tscpp/util/TextView.h | 6 ++++--
iocore/cache/CacheHosting.cc | 2 +-
iocore/cache/I_Store.h | 6 +++++-
iocore/cache/P_CacheArray.h | 8 ++++++--
iocore/eventsystem/I_IOBuffer.h | 12 ++++++++----
iocore/eventsystem/P_IOBuffer.h | 3 ++-
iocore/net/P_UnixNet.h | 6 +++++-
iocore/net/quic/QUICFrame.h | 12 ++++++++++--
mgmt/ProxyConfig.h | 6 +++++-
mgmt/utils/ExpandingArray.cc | 3 ++-
plugins/experimental/magick/magick.cc | 4 +++-
proxy/InkAPIInternal.h | 4 +++-
proxy/Milestones.h | 12 ++++++++++--
proxy/logging/LogBuffer.h | 3 ++-
src/tscore/HostLookup.cc | 6 ++++--
src/tscore/Tokenizer.cc | 3 ++-
src/tscore/unit_tests/test_Extendible.cc | 28 ++++++++++++++++++++++++----
src/tscpp/api/Headers.cc | 12 ++++++++----
src/wccp/WccpLocal.h | 9 ++++++---
30 files changed, 198 insertions(+), 63 deletions(-)
diff --git a/include/tscore/ArgParser.h b/include/tscore/ArgParser.h
index 45b0e41..a7b4b7a 100644
--- a/include/tscore/ArgParser.h
+++ b/include/tscore/ArgParser.h
@@ -48,7 +48,11 @@ public:
// bool to check if certain command/option is called
operator bool() const noexcept { return _is_called; }
// index accessing []
- std::string const &operator[](int x) const { return _values.at(x); }
+ std::string const &
+ operator[](int x) const
+ {
+ return _values.at(x);
+ }
// return the Environment variable
std::string const &env() const noexcept;
// iterator for arguments
diff --git a/include/tscore/CryptoHash.h b/include/tscore/CryptoHash.h
index 27077ad..767cb7b 100644
--- a/include/tscore/CryptoHash.h
+++ b/include/tscore/CryptoHash.h
@@ -84,7 +84,11 @@ union CryptoHash {
}
/// Access 64 bit slice.
- uint64_t operator[](int i) const { return u64[i]; }
+ uint64_t
+ operator[](int i) const
+ {
+ return u64[i];
+ }
/// Access 64 bit slice.
/// @note Identical to @ operator[] but included for symmetry.
uint64_t
diff --git a/include/tscore/History.h b/include/tscore/History.h
index e413dda..de8feb7 100644
--- a/include/tscore/History.h
+++ b/include/tscore/History.h
@@ -67,7 +67,11 @@ public:
return history_pos > Count ? Count : history_pos;
}
- const HistoryEntry &operator[](unsigned int i) const { return history[i]; }
+ const HistoryEntry &
+ operator[](unsigned int i) const
+ {
+ return history[i];
+ }
private:
HistoryEntry history[Count];
diff --git a/include/tscore/IntrusivePtr.h b/include/tscore/IntrusivePtr.h
index dcf54ae..bfe63a3 100644
--- a/include/tscore/IntrusivePtr.h
+++ b/include/tscore/IntrusivePtr.h
@@ -472,13 +472,17 @@ IntrusivePtr<T>::operator=(IntrusivePtr<U> &&that)
return *this;
}
-template <typename T> T *IntrusivePtr<T>::operator->() const
+template <typename T>
+T *
+IntrusivePtr<T>::operator->() const
{
IntrusivePtrPolicy<T>::dereferenceCheck(m_obj);
return m_obj;
}
-template <typename T> T &IntrusivePtr<T>::operator*() const
+template <typename T>
+T &
+IntrusivePtr<T>::operator*() const
{
IntrusivePtrPolicy<T>::dereferenceCheck(m_obj);
return *m_obj;
diff --git a/include/tscore/IpMap.h b/include/tscore/IpMap.h
index d84dbc4..4268afa 100644
--- a/include/tscore/IpMap.h
+++ b/include/tscore/IpMap.h
@@ -482,12 +482,14 @@ IpMap::iterator::operator==(iterator const &that) const
return _tree == that._tree && _node == that._node;
}
-inline IpMap::iterator::reference IpMap::iterator::operator*() const
+inline IpMap::iterator::reference
+IpMap::iterator::operator*() const
{
return *_node;
}
-inline IpMap::iterator::pointer IpMap::iterator::operator->() const
+inline IpMap::iterator::pointer
+IpMap::iterator::operator->() const
{
return _node;
}
diff --git a/include/tscore/Ptr.h b/include/tscore/Ptr.h
index 3a79e01..3e93477 100644
--- a/include/tscore/Ptr.h
+++ b/include/tscore/Ptr.h
@@ -105,8 +105,16 @@ public:
Ptr<T> &operator=(const Ptr<T> &);
Ptr<T> &operator=(T *);
- T *operator->() const { return (m_ptr); }
- T &operator*() const { return (*m_ptr); }
+ T *
+ operator->() const
+ {
+ return (m_ptr);
+ }
+ T &
+ operator*() const
+ {
+ return (*m_ptr);
+ }
// Making this explicit avoids unwanted conversions. See https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Safe_bool .
explicit operator bool() const { return m_ptr != nullptr; }
diff --git a/include/tscore/Scalar.h b/include/tscore/Scalar.h
index 327a178..8de5833 100644
--- a/include/tscore/Scalar.h
+++ b/include/tscore/Scalar.h
@@ -826,27 +826,39 @@ Scalar<N, C, T>::operator*=(C n) -> self &
return *this;
}
-template <intmax_t N, typename C, typename T> Scalar<N, C, T> operator*(Scalar<N, C, T> const &lhs, C n)
+template <intmax_t N, typename C, typename T>
+Scalar<N, C, T>
+operator*(Scalar<N, C, T> const &lhs, C n)
{
return Scalar<N, C, T>(lhs) *= n;
}
-template <intmax_t N, typename C, typename T> Scalar<N, C, T> operator*(C n, Scalar<N, C, T> const &rhs)
+template <intmax_t N, typename C, typename T>
+Scalar<N, C, T>
+operator*(C n, Scalar<N, C, T> const &rhs)
{
return Scalar<N, C, T>(rhs) *= n;
}
-template <intmax_t N, typename C, typename T> Scalar<N, C, T> operator*(Scalar<N, C, T> const &lhs, int n)
+template <intmax_t N, typename C, typename T>
+Scalar<N, C, T>
+operator*(Scalar<N, C, T> const &lhs, int n)
{
return Scalar<N, C, T>(lhs) *= n;
}
-template <intmax_t N, typename C, typename T> Scalar<N, C, T> operator*(int n, Scalar<N, C, T> const &rhs)
+template <intmax_t N, typename C, typename T>
+Scalar<N, C, T>
+operator*(int n, Scalar<N, C, T> const &rhs)
{
return Scalar<N, C, T>(rhs) *= n;
}
-template <intmax_t N> Scalar<N, int> operator*(Scalar<N, int> const &lhs, int n)
+template <intmax_t N>
+Scalar<N, int>
+operator*(Scalar<N, int> const &lhs, int n)
{
return Scalar<N, int>(lhs) *= n;
}
-template <intmax_t N> Scalar<N, int> operator*(int n, Scalar<N, int> const &rhs)
+template <intmax_t N>
+Scalar<N, int>
+operator*(int n, Scalar<N, int> const &rhs)
{
return Scalar<N, int>(rhs) *= n;
}
diff --git a/include/tscore/TsBuffer.h b/include/tscore/TsBuffer.h
index e2ad2f7..a823641 100644
--- a/include/tscore/TsBuffer.h
+++ b/include/tscore/TsBuffer.h
@@ -323,7 +323,8 @@ Buffer::operator==(ConstBuffer const &that) const
{
return _size == that._size && _ptr == that._ptr;
}
-inline bool Buffer::operator!() const
+inline bool
+Buffer::operator!() const
{
return !(_ptr && _size);
}
@@ -331,7 +332,8 @@ inline Buffer::operator pseudo_bool() const
{
return _ptr && _size ? &self::operator! : nullptr;
}
-inline char Buffer::operator*() const
+inline char
+Buffer::operator*() const
{
return *_ptr;
}
@@ -407,7 +409,8 @@ ConstBuffer::operator==(Buffer const &that) const
{
return _size == that._size && 0 == memcmp(_ptr, that._ptr, _size);
}
-inline bool ConstBuffer::operator!() const
+inline bool
+ConstBuffer::operator!() const
{
return !(_ptr && _size);
}
@@ -415,7 +418,8 @@ inline ConstBuffer::operator pseudo_bool() const
{
return _ptr && _size ? &self::operator! : nullptr;
}
-inline char ConstBuffer::operator*() const
+inline char
+ConstBuffer::operator*() const
{
return *_ptr;
}
@@ -438,7 +442,8 @@ ConstBuffer::data() const
{
return _ptr;
}
-inline char ConstBuffer::operator[](int n) const
+inline char
+ConstBuffer::operator[](int n) const
{
return _ptr[n];
}
diff --git a/include/tscore/ink_memory.h b/include/tscore/ink_memory.h
index 713cb02..9f772e5 100644
--- a/include/tscore/ink_memory.h
+++ b/include/tscore/ink_memory.h
@@ -591,7 +591,11 @@ public:
return *this;
}
- T *operator->() const { return *this; }
+ T *
+ operator->() const
+ {
+ return *this;
+ }
};
/** Combine two strings as file paths.
diff --git a/include/tscpp/util/IntrusiveDList.h b/include/tscpp/util/IntrusiveDList.h
index e94fda3..decbda9 100644
--- a/include/tscpp/util/IntrusiveDList.h
+++ b/include/tscpp/util/IntrusiveDList.h
@@ -493,12 +493,16 @@ ts::IntrusiveDList<L>::iterator::operator--(int) -> self_type
return tmp;
}
-template <typename L> auto ts::IntrusiveDList<L>::const_iterator::operator-> () const -> value_type *
+template <typename L>
+auto
+ts::IntrusiveDList<L>::const_iterator::operator->() const -> value_type *
{
return _v;
}
-template <typename L> auto ts::IntrusiveDList<L>::iterator::operator-> () const -> value_type *
+template <typename L>
+auto
+ts::IntrusiveDList<L>::iterator::operator->() const -> value_type *
{
return super_type::_v;
}
@@ -508,12 +512,16 @@ template <typename L> ts::IntrusiveDList<L>::const_iterator::operator value_type
return _v;
}
-template <typename L> auto ts::IntrusiveDList<L>::const_iterator::operator*() const -> value_type &
+template <typename L>
+auto
+ts::IntrusiveDList<L>::const_iterator::operator*() const -> value_type &
{
return *_v;
}
-template <typename L> auto ts::IntrusiveDList<L>::iterator::operator*() const -> value_type &
+template <typename L>
+auto
+ts::IntrusiveDList<L>::iterator::operator*() const -> value_type &
{
return *super_type::_v;
}
diff --git a/include/tscpp/util/MemSpan.h b/include/tscpp/util/MemSpan.h
index 1c757b3..e34862d 100644
--- a/include/tscpp/util/MemSpan.h
+++ b/include/tscpp/util/MemSpan.h
@@ -603,7 +603,9 @@ MemSpan<T>::operator!=(self_type const &that) const
return !(*this == that);
}
-template <typename T> bool MemSpan<T>::operator!() const
+template <typename T>
+bool
+MemSpan<T>::operator!() const
{
return _count == 0;
}
@@ -641,7 +643,9 @@ MemSpan<T>::end() const
return _ptr + _count;
}
-template <typename T> T &MemSpan<T>::operator[](size_t idx) const
+template <typename T>
+T &
+MemSpan<T>::operator[](size_t idx) const
{
return _ptr[idx];
}
@@ -769,7 +773,8 @@ MemSpan<void>::operator!=(self_type const &that) const
return !(*this == that);
}
-inline bool MemSpan<void>::operator!() const
+inline bool
+MemSpan<void>::operator!() const
{
return _size == 0;
}
diff --git a/include/tscpp/util/TextView.h b/include/tscpp/util/TextView.h
index 894b166..bf0f8ae 100644
--- a/include/tscpp/util/TextView.h
+++ b/include/tscpp/util/TextView.h
@@ -624,12 +624,14 @@ TextView::clear()
return *this;
}
-inline char TextView::operator*() const
+inline char
+TextView::operator*() const
{
return this->empty() ? 0 : *(this->data());
}
-inline bool TextView::operator!() const
+inline bool
+TextView::operator!() const
{
return this->empty();
}
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index f7754d2..3f2aa20 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -875,7 +875,7 @@ create_config(RegressionTest *t, int num)
}
// make sure we have at least 1280 M bytes
- if (total_space<(10 << 27)>> STORE_BLOCK_SHIFT) {
+ if (total_space < ((10 << 27) >> STORE_BLOCK_SHIFT)) {
rprintf(t, "Not enough space for 10 volume\n");
return 0;
}
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index 73a2b6d..ae44bf8 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -62,7 +62,11 @@ struct span_diskid_t {
return id[0] == rhs.id[0] && id[1] == rhs.id[1];
}
- int64_t &operator[](unsigned i) { return id[i]; }
+ int64_t &
+ operator[](unsigned i)
+ {
+ return id[i];
+ }
};
//
diff --git a/iocore/cache/P_CacheArray.h b/iocore/cache/P_CacheArray.h
index bc26179..b18c707 100644
--- a/iocore/cache/P_CacheArray.h
+++ b/iocore/cache/P_CacheArray.h
@@ -81,12 +81,16 @@ template <class T> TS_INLINE CacheArray<T>::operator const T *() const
return data;
}
-template <class T> TS_INLINE CacheArray<T>::operator T *()
+template <class T>
+TS_INLINE
+CacheArray<T>::operator T *()
{
return data;
}
-template <class T> TS_INLINE T &CacheArray<T>::operator[](int idx)
+template <class T>
+TS_INLINE T &
+CacheArray<T>::operator[](int idx)
{
return data[idx];
}
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index f8d317b..313e13f 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -1509,12 +1509,14 @@ IOBufferChain::const_iterator::operator!=(self_type const &that) const
return _b != that._b;
}
-inline IOBufferChain::const_iterator::value_type &IOBufferChain::const_iterator::operator*() const
+inline IOBufferChain::const_iterator::value_type &
+IOBufferChain::const_iterator::operator*() const
{
return *_b;
}
-inline IOBufferChain::const_iterator::value_type *IOBufferChain::const_iterator::operator->() const
+inline IOBufferChain::const_iterator::value_type *
+IOBufferChain::const_iterator::operator->() const
{
return _b;
}
@@ -1534,12 +1536,14 @@ IOBufferChain::const_iterator::operator++(int)
return pre;
}
-inline IOBufferChain::iterator::value_type &IOBufferChain::iterator::operator*() const
+inline IOBufferChain::iterator::value_type &
+IOBufferChain::iterator::operator*() const
{
return *_b;
}
-inline IOBufferChain::iterator::value_type *IOBufferChain::iterator::operator->() const
+inline IOBufferChain::iterator::value_type *
+IOBufferChain::iterator::operator->() const
{
return _b;
}
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 8814614..5d77c56 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -605,7 +605,8 @@ IOBufferReader::consume(int64_t n)
}
}
-TS_INLINE char &IOBufferReader::operator[](int64_t i)
+TS_INLINE char &
+IOBufferReader::operator[](int64_t i)
{
static char default_ret = '\0'; // This is just to avoid compiler warnings...
IOBufferBlock *b = block.get();
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 800be6b..da1057d 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -263,7 +263,11 @@ public:
Making it a method means the knowledge of which member is the first one
is localized to this struct, not scattered about.
*/
- uint32_t &operator[](int n) { return *(&max_connections_in + n); }
+ uint32_t &
+ operator[](int n)
+ {
+ return *(&max_connections_in + n);
+ }
};
/** Static global config, set and updated per process.
diff --git a/iocore/net/quic/QUICFrame.h b/iocore/net/quic/QUICFrame.h
index ab21b17..8d78510 100644
--- a/iocore/net/quic/QUICFrame.h
+++ b/iocore/net/quic/QUICFrame.h
@@ -210,8 +210,16 @@ public:
public:
const_iterator(uint8_t index, const std::vector<QUICAckFrame::AckBlock> *ack_blocks);
- const QUICAckFrame::AckBlock &operator*() const { return this->_current_block; };
- const QUICAckFrame::AckBlock *operator->() const { return &this->_current_block; };
+ const QUICAckFrame::AckBlock &
+ operator*() const
+ {
+ return this->_current_block;
+ };
+ const QUICAckFrame::AckBlock *
+ operator->() const
+ {
+ return &this->_current_block;
+ };
const QUICAckFrame::AckBlock &operator++();
const bool operator!=(const const_iterator &ite) const;
const bool operator==(const const_iterator &ite) const;
diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h
index abd7c78..8f837a3 100644
--- a/mgmt/ProxyConfig.h
+++ b/mgmt/ProxyConfig.h
@@ -68,7 +68,11 @@ public:
~scoped_config() { ClassType::release(ptr); }
operator bool() const { return ptr != nullptr; }
operator const ConfigType *() const { return ptr; }
- const ConfigType *operator->() const { return ptr; }
+ const ConfigType *
+ operator->() const
+ {
+ return ptr;
+ }
private:
ConfigType *ptr;
diff --git a/mgmt/utils/ExpandingArray.cc b/mgmt/utils/ExpandingArray.cc
index 8521735..0ec893f 100644
--- a/mgmt/utils/ExpandingArray.cc
+++ b/mgmt/utils/ExpandingArray.cc
@@ -48,7 +48,8 @@ ExpandingArray::~ExpandingArray()
ats_free(internalArray);
}
-void *ExpandingArray::operator[](int index)
+void *
+ExpandingArray::operator[](int index)
{
if (index < numValidValues) {
return internalArray[index];
diff --git a/plugins/experimental/magick/magick.cc b/plugins/experimental/magick/magick.cc
index 2e6a18b..d320d01 100644
--- a/plugins/experimental/magick/magick.cc
+++ b/plugins/experimental/magick/magick.cc
@@ -352,7 +352,9 @@ struct QueryMap {
QueryMap(std::string &&s) : content_(s) { parse(); }
- template <typename T> const Vector &operator[](T &&k) const
+ template <typename T>
+ const Vector &
+ operator[](T &&k) const
{
const auto iterator = map_.find(k);
if (iterator != map_.end()) {
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index 5d79c9a..d140996 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -224,7 +224,9 @@ FeatureAPIHooks<ID, N>::get(ID id) const
return likely(is_valid(id)) ? m_hooks[id].head() : nullptr;
}
-template <typename ID, int N> APIHooks const *FeatureAPIHooks<ID, N>::operator[](ID id) const
+template <typename ID, int N>
+APIHooks const *
+FeatureAPIHooks<ID, N>::operator[](ID id) const
{
return likely(is_valid(id)) ? &(m_hooks[id]) : nullptr;
}
diff --git a/proxy/Milestones.h b/proxy/Milestones.h
index 744a326..737fd05 100644
--- a/proxy/Milestones.h
+++ b/proxy/Milestones.h
@@ -33,8 +33,16 @@
template <class T, size_t entries> class Milestones
{
public:
- ink_hrtime &operator[](T ms) { return this->_milestones[static_cast<size_t>(ms)]; }
- ink_hrtime operator[](T ms) const { return this->_milestones[static_cast<size_t>(ms)]; }
+ ink_hrtime &
+ operator[](T ms)
+ {
+ return this->_milestones[static_cast<size_t>(ms)];
+ }
+ ink_hrtime
+ operator[](T ms) const
+ {
+ return this->_milestones[static_cast<size_t>(ms)];
+ }
/**
* Mark given milestone with timestamp if it's not marked yet
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 1c64a18..581d99c 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -133,7 +133,8 @@ public:
LogBuffer(LogObject *owner, LogBufferHeader *header);
~LogBuffer();
- char &operator[](int idx)
+ char &
+ operator[](int idx)
{
ink_assert(idx >= 0);
ink_assert((size_t)idx < m_size);
diff --git a/src/tscore/HostLookup.cc b/src/tscore/HostLookup.cc
index 382ef4f..b70a45a 100644
--- a/src/tscore/HostLookup.cc
+++ b/src/tscore/HostLookup.cc
@@ -388,13 +388,15 @@ CharIndex::end() -> iterator
return {};
}
-auto CharIndex::iterator::operator-> () -> value_type *
+auto
+CharIndex::iterator::operator->() -> value_type *
{
ink_assert(state.block != nullptr); // clang!
return state.block->array[state.index].branch;
}
-auto CharIndex::iterator::operator*() -> value_type &
+auto
+CharIndex::iterator::operator*() -> value_type &
{
ink_assert(state.block != nullptr); // clang!
return *(state.block->array[state.index].branch);
diff --git a/src/tscore/Tokenizer.cc b/src/tscore/Tokenizer.cc
index 068b4e0..f40973f 100644
--- a/src/tscore/Tokenizer.cc
+++ b/src/tscore/Tokenizer.cc
@@ -275,7 +275,8 @@ Tokenizer::addToken(char *startAddr, int length)
}
}
-const char *Tokenizer::operator[](unsigned index) const
+const char *
+Tokenizer::operator[](unsigned index) const
{
const tok_node *cur_node = &start_node;
unsigned cur_start = 0;
diff --git a/src/tscore/unit_tests/test_Extendible.cc b/src/tscore/unit_tests/test_Extendible.cc
index a6b0210..3219b7a 100644
--- a/src/tscore/unit_tests/test_Extendible.cc
+++ b/src/tscore/unit_tests/test_Extendible.cc
@@ -84,8 +84,18 @@ public:
uint16_t c = {3};
// operator[]
- template <typename F> decltype(auto) operator[](F field) const { return ext::get(*this, field); }
- template <typename F> decltype(auto) operator[](F field) { return ext::set(*this, field); }
+ template <typename F>
+ decltype(auto)
+ operator[](F field) const
+ {
+ return ext::get(*this, field);
+ }
+ template <typename F>
+ decltype(auto)
+ operator[](F field)
+ {
+ return ext::set(*this, field);
+ }
};
ext::FieldId<C, std::atomic<uint16_t>> ext_c_1;
@@ -172,8 +182,18 @@ struct Derived : Extendible<Derived> {
string m_str;
// operator[] for shorthand
- template <typename F> decltype(auto) operator[](F field) const { return ext::get(*this, field); }
- template <typename F> decltype(auto) operator[](F field) { return ext::set(*this, field); }
+ template <typename F>
+ decltype(auto)
+ operator[](F field) const
+ {
+ return ext::get(*this, field);
+ }
+ template <typename F>
+ decltype(auto)
+ operator[](F field)
+ {
+ return ext::set(*this, field);
+ }
static const string
testFormat()
diff --git a/src/tscpp/api/Headers.cc b/src/tscpp/api/Headers.cc
index 4a04a59..6b19ffd 100644
--- a/src/tscpp/api/Headers.cc
+++ b/src/tscpp/api/Headers.cc
@@ -133,7 +133,8 @@ header_field_value_iterator::~header_field_value_iterator()
delete state_;
}
-std::string header_field_value_iterator::operator*()
+std::string
+header_field_value_iterator::operator*()
{
if (state_->index_ >= 0) {
int length = 0;
@@ -363,7 +364,8 @@ HeaderField::operator=(const char *field_value)
return append(field_value);
}
-std::string HeaderField::operator[](const int index)
+std::string
+HeaderField::operator[](const int index)
{
return *header_field_value_iterator(iter_.state_->mloc_container_->hdr_buf_, iter_.state_->mloc_container_->hdr_loc_,
iter_.state_->mloc_container_->field_loc_, index);
@@ -464,7 +466,8 @@ header_field_iterator::operator!=(const header_field_iterator &rhs) const
return !operator==(rhs);
}
-HeaderField header_field_iterator::operator*()
+HeaderField
+header_field_iterator::operator*()
{
return HeaderField(*this);
}
@@ -670,7 +673,8 @@ Headers::set(const std::string &key, const std::string &value)
return append(key, value);
}
-HeaderField Headers::operator[](const std::string &key)
+HeaderField
+Headers::operator[](const std::string &key)
{
// In STL fashion if the key doesn't exist it will be added with an empty value.
header_field_iterator it = find(key);
diff --git a/src/wccp/WccpLocal.h b/src/wccp/WccpLocal.h
index 2b704f8..7e173ab 100644
--- a/src/wccp/WccpLocal.h
+++ b/src/wccp/WccpLocal.h
@@ -3369,11 +3369,13 @@ HashAssignElt::getBucketBase()
// coverity[ptr_arith]
return reinterpret_cast<Bucket *>((&m_count + 1 + this->getCount()));
}
-inline HashAssignElt::Bucket &HashAssignElt::operator[](size_t idx)
+inline HashAssignElt::Bucket &
+HashAssignElt::operator[](size_t idx)
{
return this->getBucketBase()[idx];
}
-inline HashAssignElt::Bucket const &HashAssignElt::operator[](size_t idx) const
+inline HashAssignElt::Bucket const &
+HashAssignElt::operator[](size_t idx) const
{
return (*(const_cast<self *>(this)))[idx];
}
@@ -3386,7 +3388,8 @@ MaskAssignElt::getCount() const
{
return ntohl(m_count);
}
-inline MaskValueSetElt *MaskAssignElt::appender::operator->()
+inline MaskValueSetElt *
+MaskAssignElt::appender::operator->()
{
return m_set;
}