import ceph 14.2.5

[ceph.git] / ceph / src / seastar / fmt / test / mock-allocator.h

diff --git a/ceph/src/seastar/fmt/test/mock-allocator.h b/ceph/src/seastar/fmt/test/mock-allocator.h
index 8776969033105975585db95a7dc59afb393cd5e4..65ee6ab818564b75b14c2dd1f748c4c2648a3175 100644 (file)
--- a/ceph/src/seastar/fmt/test/mock-allocator.h
+++ b/ceph/src/seastar/fmt/test/mock-allocator.h
@@ -28,13 +28,13 @@ class allocator_ref {
 
   void move(allocator_ref &other) {
     alloc_ = other.alloc_;
-    other.alloc_ = nullptr;
+    other.alloc_ = FMT_NULL;
   }
 
  public:
   typedef typename Allocator::value_type value_type;
 
-  explicit allocator_ref(Allocator *alloc = nullptr) : alloc_(alloc) {}
+  explicit allocator_ref(Allocator *alloc = FMT_NULL) : alloc_(alloc) {}
 
   allocator_ref(const allocator_ref &other) : alloc_(other.alloc_) {}
   allocator_ref(allocator_ref &&other) { move(other); }