1 files changed, 15 insertions, 26 deletions

diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp
index d024b704a7..1ee65e6f72 100644
--- a/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/jrnl/enq_map.cpp
@@ -19,22 +19,11 @@
  *
  */
 
-/**
- * \file enq_map.cpp
- *
- * Qpid asynchronous store plugin library
- *
- * File containing code for class mrg::journal::enq_map (enqueue map). See
- * comments in file enq_map.h for details.
- *
- * \author Kim van der Riet
- */
-
-#include "qpid/legacystore/jrnl/enq_map.h"
+#include "qpid/linearstore/jrnl/enq_map.h"
 
 #include <iomanip>
-#include "qpid/legacystore/jrnl/jerrno.h"
-#include "qpid/legacystore/jrnl/slock.h"
+#include "qpid/linearstore/jrnl/jerrno.h"
+#include "qpid/linearstore/jrnl/slock.h"
 #include <sstream>
 
 
@@ -59,20 +48,20 @@ enq_map::enq_map():
 enq_map::~enq_map() {}
 
 void
-enq_map::set_num_jfiles(const u_int16_t num_jfiles)
+enq_map::set_num_jfiles(const uint16_t num_jfiles)
 {
     _pfid_enq_cnt.resize(num_jfiles, 0);
 }
 
 
 int16_t
-enq_map::insert_pfid(const u_int64_t rid, const u_int16_t pfid)
+enq_map::insert_pfid(const uint64_t rid, const uint16_t pfid)
 {
     return insert_pfid(rid, pfid, false);
 }
 
 int16_t
-enq_map::insert_pfid(const u_int64_t rid, const u_int16_t pfid, const bool locked)
+enq_map::insert_pfid(const uint64_t rid, const uint16_t pfid, const bool locked)
 {
     std::pair<emap_itr, bool> ret;
     emap_data_struct rec(pfid, locked);
@@ -87,7 +76,7 @@ enq_map::insert_pfid(const u_int64_t rid, const u_int16_t pfid, const bool locke
 }
 
 int16_t
-enq_map::get_pfid(const u_int64_t rid)
+enq_map::get_pfid(const uint64_t rid)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -99,7 +88,7 @@ enq_map::get_pfid(const u_int64_t rid)
 }
 
 int16_t
-enq_map::get_remove_pfid(const u_int64_t rid, const bool txn_flag)
+enq_map::get_remove_pfid(const uint64_t rid, const bool txn_flag)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -107,14 +96,14 @@ enq_map::get_remove_pfid(const u_int64_t rid, const bool txn_flag)
         return EMAP_RID_NOT_FOUND;
     if (itr->second._lock && !txn_flag) // locked, but not a commit/abort
         return EMAP_LOCKED;
-    u_int16_t pfid = itr->second._pfid;
+    uint16_t pfid = itr->second._pfid;
     _map.erase(itr);
     _pfid_enq_cnt.at(pfid)--;
     return pfid;
 }
 
 bool
-enq_map::is_enqueued(const u_int64_t rid, bool ignore_lock)
+enq_map::is_enqueued(const uint64_t rid, bool ignore_lock)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -126,7 +115,7 @@ enq_map::is_enqueued(const u_int64_t rid, bool ignore_lock)
 }
 
 int16_t
-enq_map::lock(const u_int64_t rid)
+enq_map::lock(const uint64_t rid)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -137,7 +126,7 @@ enq_map::lock(const u_int64_t rid)
 }
 
 int16_t
-enq_map::unlock(const u_int64_t rid)
+enq_map::unlock(const uint64_t rid)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -148,7 +137,7 @@ enq_map::unlock(const u_int64_t rid)
 }
 
 int16_t
-enq_map::is_locked(const u_int64_t rid)
+enq_map::is_locked(const uint64_t rid)
 {
     slock s(_mutex);
     emap_itr itr = _map.find(rid);
@@ -158,7 +147,7 @@ enq_map::is_locked(const u_int64_t rid)
 }
 
 void
-enq_map::rid_list(std::vector<u_int64_t>& rv)
+enq_map::rid_list(std::vector<uint64_t>& rv)
 {
     rv.clear();
     {
@@ -169,7 +158,7 @@ enq_map::rid_list(std::vector<u_int64_t>& rv)
 }
 
 void
-enq_map::pfid_list(std::vector<u_int16_t>& fv)
+enq_map::pfid_list(std::vector<uint16_t>& fv)
 {
     fv.clear();
     {