rgw: Disambiguate call to max

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
index 8a84083c75704baff6db6c1c7b48ee1a3e72aa7a..ee651e1371bd1efe341363cee9081a7fe5209e1c 100644 (file)
--- a/src/rgw/rgw_formats.cc
+++ b/src/rgw/rgw_formats.cc
@@ -218,7 +218,7 @@ void RGWFormatter_Plain::write_data(const char *fmt, ...)
 done:
 #define LARGE_ENOUGH_BUF 4096
   if (!buf) {
-    max_len = max(LARGE_ENOUGH_BUF, size);
+    max_len = ceph::max(LARGE_ENOUGH_BUF, size);
     buf = (char *)malloc(max_len);
     if (!buf) {
       cerr << "ERROR: RGWFormatter_Plain::write_data: failed allocating " << max_len << " bytes" << std::endl;

diff --git a/src/test/rgw/test_rgw_manifest.cc b/src/test/rgw/test_rgw_manifest.cc
index 0744030820a4376571cd85b53dd2132089bc063d..0efce05628239091b6ce5bdbec6fb6a4803fc270 100644 (file)
--- a/src/test/rgw/test_rgw_manifest.cc
+++ b/src/test/rgw/test_rgw_manifest.cc
@@ -82,7 +82,7 @@ public:
 
   void append(uint64_t ofs, const OldObjManifestPart& part) {
     objs[ofs] = part;
-    obj_size = max(obj_size, ofs + part.size);
+    obj_size = ceph::max(obj_size, ofs + part.size);
   }
 
   void encode(bufferlist& bl) const {