Fixed warnings

5 files changed, 8 insertions, 14 deletions

diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp
index 5024a24b5bc..ca1a1e5fa1f 100644
--- a/cpp/src/Freeze/EvictorI.cpp
+++ b/cpp/src/Freeze/EvictorI.cpp
@@ -1433,13 +1433,7 @@ bool
 Freeze::EvictorI::load(Dbc* dbc, Key& key, vector<Identity>& identities)
 {
     Key root;
-    EvictorStorageKey esk;
-    unmarshal(esk, key, _communicator);
-    identities.push_back(esk.identity);
-    marshalRoot(esk.identity, root, _communicator);
-
     Dbt dbKey;
-
     Dbt dbValue;
     dbValue.set_flags(DB_DBT_USERMEM | DB_DBT_PARTIAL);
 	  
@@ -1807,7 +1801,7 @@ Freeze::EvictorI::load(const Identity& ident)
             //
 	    Dbt dbKey;
 	    initializeOutDbt(key, dbKey);
-	    dbKey.set_size(root.size());
+	    dbKey.set_size(static_cast<u_int32_t>(root.size()));
 
 	    Dbt dbValue;
 	    initializeOutDbt(value, dbValue);
diff --git a/cpp/src/Freeze/EvictorIteratorI.cpp b/cpp/src/Freeze/EvictorIteratorI.cpp
index 2d348e63b86..346301f0148 100644
--- a/cpp/src/Freeze/EvictorIteratorI.cpp
+++ b/cpp/src/Freeze/EvictorIteratorI.cpp
@@ -120,7 +120,7 @@ Freeze::EvictorIteratorI::nextBatch()
 		    //
 		    // Will be used as input as well
 		    //
-		    dbKey.set_size(firstKey.size());
+		    dbKey.set_size(static_cast<u_int32_t>(firstKey.size()));
 		}
 		
 		if(_loadServants)
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp
index 6f8ed594301..1e0dd451272 100644
--- a/cpp/src/Freeze/IndexI.cpp
+++ b/cpp/src/Freeze/IndexI.cpp
@@ -46,7 +46,7 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const
     //
     // Berkeley DB 4.1.25 bug: it should not write into dbKey
     //
-    dbKey.set_ulen(bytes.size());
+    dbKey.set_ulen(static_cast<u_int32_t>(bytes.size()));
     
     Key pkey(1024);
     Dbt pdbKey;
@@ -321,7 +321,7 @@ Freeze::IndexI::secondaryKeyCreate(Db* secondary, const Dbt* dbKey,
 	    void* data = malloc(bytes.size());
 	    memcpy(data, &bytes[0], bytes.size());
 	    result->set_data(data);
-	    result->set_size(bytes.size());
+	    result->set_size(static_cast<u_int32_t>(bytes.size()));
 	    return 0;
 	}
     }
diff --git a/cpp/src/Freeze/Util.cpp b/cpp/src/Freeze/Util.cpp
index ebaca432024..f148429d68f 100644
--- a/cpp/src/Freeze/Util.cpp
+++ b/cpp/src/Freeze/Util.cpp
@@ -31,7 +31,7 @@ Freeze::handleMemoryException(const DbMemoryException& dx, Key& key, Dbt& dbKey)
 
 	key.resize(dbKey.get_size());
 	initializeOutDbt(key, dbKey);
-	dbKey.set_size(oldKeySize);
+	dbKey.set_size(static_cast<u_int32_t>(oldKeySize));
     }
     else
     {
@@ -54,7 +54,7 @@ Freeze::handleMemoryException(const DbMemoryException& dx, Key& key, Dbt& dbKey,
 	size_t oldKeySize = key.size();
 	key.resize(dbKey.get_size());
 	initializeOutDbt(key, dbKey);
-	dbKey.set_size(oldKeySize);
+	dbKey.set_size(static_cast<u_int32_t>(oldKeySize));
 	resized = true;
     }
     
diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h
index e5ec22b758a..bde789ce8f1 100644
--- a/cpp/src/Freeze/Util.h
+++ b/cpp/src/Freeze/Util.h
@@ -34,7 +34,7 @@ inline void
 initializeInDbt(const std::vector<Ice::Byte>& v, Dbt& dbt)
 {
     dbt.set_data(const_cast<Ice::Byte*>(&v[0]));
-    dbt.set_size(v.size());
+    dbt.set_size(static_cast<u_int32_t>(v.size()));
     dbt.set_ulen(0);
     dbt.set_dlen(0);
     dbt.set_doff(0);
@@ -47,7 +47,7 @@ initializeOutDbt(std::vector<Ice::Byte>& v, Dbt& dbt)
     v.resize(v.capacity());
     dbt.set_data(&v[0]);
     dbt.set_size(0);
-    dbt.set_ulen(v.size());
+    dbt.set_ulen(static_cast<u_int32_t>(v.size()));
     dbt.set_dlen(0);
     dbt.set_doff(0);
     dbt.set_flags(DB_DBT_USERMEM);