diff options
| author | amitkuma <amitkuma@redhat.com> | 2017-10-05 15:47:18 +0200 |
|---|---|---|
| committer | amitkuma <amitkuma@redhat.com> | 2017-11-20 13:57:49 +0100 |
| commit | 0748d7c805899043828b5573a3dc81c0f1a6d465 (patch) | |
| tree | 0a6c062986342f00adaf2d63556f71c090abc566 /src/msg/async/dpdk | |
| parent | Merge pull request #18980 from shinobu-x/os_filestore_filestore_nit_cleanup (diff) | |
| download | ceph-0748d7c805899043828b5573a3dc81c0f1a6d465.tar.xz ceph-0748d7c805899043828b5573a3dc81c0f1a6d465.zip | |
cleanup: Replacing MIN,MAX with std::min,std::max
Signed-off-by: Amit Kumar <amitkuma@redhat.com>
Diffstat (limited to 'src/msg/async/dpdk')
| -rw-r--r-- | src/msg/async/dpdk/DPDKStack.h | 2 | ||||
| -rw-r--r-- | src/msg/async/dpdk/Packet.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/msg/async/dpdk/DPDKStack.h b/src/msg/async/dpdk/DPDKStack.h index af5a5fd2400..73759128fde 100644 --- a/src/msg/async/dpdk/DPDKStack.h +++ b/src/msg/async/dpdk/DPDKStack.h @@ -147,7 +147,7 @@ class NativeConnectedSocketImpl : public ConnectedSocketImpl { // space for next ptr. if (len > 0) break; - seglen = MIN(seglen, available); + seglen = std::min(seglen, available); } len += seglen; frags.push_back(fragment{(char*)pb->c_str(), seglen}); diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h index b8134573fa3..000329b4cfd 100644 --- a/src/msg/async/dpdk/Packet.h +++ b/src/msg/async/dpdk/Packet.h @@ -125,7 +125,7 @@ class Packet { pseudo_vector fragments() { return { frags, _nr_frags }; } static std::unique_ptr<impl> allocate(size_t nr_frags) { - nr_frags = MAX(nr_frags, default_nr_frags); + nr_frags = std::max(nr_frags, default_nr_frags); return std::unique_ptr<impl>(new (nr_frags) impl(nr_frags)); } |