From 52fe08ab7ba4dcb9efe7de9b39e9740c1386eeb0 Mon Sep 17 00:00:00 2001 From: sageweil Date: Thu, 29 Nov 2007 00:27:39 +0000 Subject: [PATCH] minor cleanup git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2140 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/messages/MMDSMap.h | 2 +- trunk/ceph/msg/SimpleMessenger.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/ceph/messages/MMDSMap.h b/trunk/ceph/messages/MMDSMap.h index 2abea39f20b46..96c0031f72231 100644 --- a/trunk/ceph/messages/MMDSMap.h +++ b/trunk/ceph/messages/MMDSMap.h @@ -45,7 +45,7 @@ class MMDSMap : public Message { } */ - version_t epoch; + epoch_t epoch; bufferlist encoded; version_t get_epoch() const { return epoch; } diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc index 6f956dff5a237..e8f94a9876162 100644 --- a/trunk/ceph/msg/SimpleMessenger.cc +++ b/trunk/ceph/msg/SimpleMessenger.cc @@ -128,7 +128,7 @@ int Rank::Accepter::start() assert(listen_sd > 0); /* bind to port */ - int rc = bind(listen_sd, (struct sockaddr *) &listen_addr, sizeof(listen_addr)); + int rc = ::bind(listen_sd, (struct sockaddr *) &listen_addr, sizeof(listen_addr)); if (rc < 0) derr(0) << "accepter.start unable to bind to " << g_my_addr.v.ipaddr << dendl; assert(rc >= 0); -- 2.39.5