update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / msgr / test_async_driver.cc

diff --git a/ceph/src/test/msgr/test_async_driver.cc b/ceph/src/test/msgr/test_async_driver.cc
index 08399dd47d7a65ea4d0e7722aea79599141bca0b..08d35a0e1922becad5a06790218c701843dae577 100644 (file)
--- a/ceph/src/test/msgr/test_async_driver.cc
+++ b/ceph/src/test/msgr/test_async_driver.cc
@@ -149,12 +149,12 @@ void* echoclient(void *arg)
   sa.sin_port = htons(port);
   char addr[] = "127.0.0.1";
   int r = inet_pton(AF_INET, addr, &sa.sin_addr);
-  assert(r == 1);
+  ceph_assert(r == 1);
 
   int connect_sd = ::socket(AF_INET, SOCK_STREAM, 0);
   if (connect_sd >= 0) {
     r = connect(connect_sd, (struct sockaddr*)&sa, sizeof(sa));
-    assert(r == 0);
+    ceph_assert(r == 0);
     int t = 0;
   
     do {
@@ -254,7 +254,7 @@ TEST_P(EventDriverTest, NetworkSocketTest) {
 class FakeEvent : public EventCallback {
 
  public:
-  void do_request(int fd_or_id) override {}
+  void do_request(uint64_t fd_or_id) override {}
 };
 
 TEST(EventCenterTest, FileEventExpansion) {
@@ -302,7 +302,7 @@ class CountEvent: public EventCallback {
 
  public:
   CountEvent(std::atomic<unsigned> *atomic, Mutex *l, Cond *c): count(atomic), lock(l), cond(c) {}
-  void do_request(int id) override {
+  void do_request(uint64_t id) override {
     lock->Lock();
     (*count)--;
     cond->Signal();