minor cleanup

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2140 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/messages/MMDSMap.h b/trunk/ceph/messages/MMDSMap.h
index 2abea39f20b46cea8a63f52e925bd616b952f8d4..96c0031f72231c070366d896ac8af9022245dcf7 100644 (file)
--- 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 6f956dff5a237b53f48bde3d5ff5e48f4ec84bd4..e8f94a9876162438f6c554b165509dd9a75f2a1a 100644 (file)
--- 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);