update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mgr / PyFormatter.cc

diff --git a/ceph/src/mgr/PyFormatter.cc b/ceph/src/mgr/PyFormatter.cc
index 8bcbaca4eb11e3fe4b7e2589b394fcf5bd7b4b30..a90674734eac767738d063a6152487d79885fa72 100644 (file)
--- a/ceph/src/mgr/PyFormatter.cc
+++ b/ceph/src/mgr/PyFormatter.cc
@@ -38,15 +38,15 @@ void PyFormatter::open_object_section(const char *name)
 
 void PyFormatter::dump_unsigned(const char *name, uint64_t u)
 {
-  PyObject *p = PyLong_FromLongLong(u);
-  assert(p);
+  PyObject *p = PyLong_FromUnsignedLong(u);
+  ceph_assert(p);
   dump_pyobject(name, p);
 }
 
 void PyFormatter::dump_int(const char *name, int64_t u)
 {
   PyObject *p = PyLong_FromLongLong(u);
-  assert(p);
+  ceph_assert(p);
   dump_pyobject(name, p);
 }
 
@@ -55,7 +55,7 @@ void PyFormatter::dump_float(const char *name, double d)
   dump_pyobject(name, PyFloat_FromDouble(d));
 }
 
-void PyFormatter::dump_string(const char *name, boost::string_view s)
+void PyFormatter::dump_string(const char *name, std::string_view s)
 {
   dump_pyobject(name, PyString_FromString(s.data()));
 }