Minor change: uses size_t instead of signed int for index/comparison.

Author: Jinglei Ren

Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-std=c++11 -g -Wall -pthread -I./
-LDFLAGS= -L/home/basicthinker/Projects/sitevm_dune-master/bin -L/home/basicthinker/Projects/dune/libdune -lpthread -ltbb -lsitevm -ldune
+LDFLAGS= -L/home/jinglei/Projects/sitevm_dune-master/bin -L/home/jinglei/Projects/dune/libdune -lpthread -ltbb -lsitevm -ldune
 SUBDIRS=core db
 SUBSRCS=$(wildcard core/*.cc) $(wildcard db/*.cc)
 OBJECTS=$(SUBSRCS:.cc=.o)

db/Makefile

@@ -1,6 +1,6 @@
 CC=g++
 CFLAGS=-std=c++11 -c -g -Wall
-INCLUDES=-I../ -I/home/basicthinker/Projects/sitevm_dune-master -I/home/basicthinker/Projects/vm-persistence
+INCLUDES=-I../ -I/home/jinglei/Projects/sitevm_dune-master -I/home/jinglei/Projects/vm-persistence
 SOURCES=$(wildcard *.cc)
 OBJECTS=$(SOURCES:.cc=.o)
 

lib/stl_hashtable.h

@@ -85,15 +85,15 @@ V StlHashtable<V, MA, PA>::Remove(const char *key) {
 
 template<class V, class MA, class PA>
 std::vector<typename StlHashtable<V, MA, PA>::KVPair>
-StlHashtable<V, MA, PA>::Entries(const char *key, size_t n) const {
+StlHashtable<V, MA, PA>::Entries(const char *key, std::size_t n) const {
  std::vector<KVPair> pairs;
  typename Hashtable::const_iterator pos;
  if (!key) {
  pos = table_.cbegin();
  } else {
  pos = table_.find(String::Wrap(key));
  }
- for (int i = 0; pos != table_.end() && i < n; ++pos, ++i) {
+ for (std::size_t i = 0; pos != table_.end() && i < n; ++pos, ++i) {
  pairs.push_back(std::make_pair(pos->first.value(), pos->second));
  }
  return pairs;

lib/tbb_rand_hashtable.h

@@ -84,12 +84,12 @@ V TbbRandHashtable<V>::Remove(const char *key) {
 
 template<class V>
 std::vector<typename TbbRandHashtable<V>::KVPair> TbbRandHashtable<V>::Entries(
- const char *key, size_t n) const {
+ const char *key, std::size_t n) const {
  std::vector<KVPair> pairs;
  typename Hashtable::const_iterator pos;
  tbb::queuing_rw_mutex::scoped_lock lock(mutex_);
  pos = key ? table_.equal_range(String::Wrap(key)).first : table_.begin();
- for (int i = 0; pos != table_.end() && i < n; ++pos, ++i) {
+ for (std::size_t i = 0; pos != table_.end() && i < n; ++pos, ++i) {
  pairs.push_back(std::make_pair(pos->first.value(), pos->second));
  }
  return pairs;

lib/tbb_scan_hashtable.h

@@ -84,12 +84,12 @@ V TbbScanHashtable<V>::Remove(const char *key) {
 
 template<class V>
 std::vector<typename TbbScanHashtable<V>::KVPair> TbbScanHashtable<V>::Entries(
- const char *key, size_t n) const {
+ const char *key, std::size_t n) const {
  std::vector<KVPair> pairs;
  typename Hashtable::const_iterator pos;
  tbb::queuing_rw_mutex::scoped_lock lock(mutex_, false);
  pos = key ? table_.equal_range(String::Wrap(key)).first : table_.begin();
- for (int i = 0; pos != table_.end() && i < n; ++pos, ++i) {
+ for (std::size_t i = 0; pos != table_.end() && i < n; ++pos, ++i) {
  pairs.push_back(std::make_pair(pos->first.value(), pos->second));
  }
  return pairs;