make gcc 4.8.* happy

apavlo · Mar 12, 2014 · d0ae5e3 · d0ae5e3
1 parent a6170c1
commit d0ae5e3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/ee/indexes/indexkey.h b/src/ee/indexes/indexkey.h
@@ -158,7 +158,7 @@ class IntsKey {
              * in this next uint64_t.
              */
             if (intraKeyOffset < 0) {
-                intraKeyOffset = sizeof(uint64_t) - 1;
+                intraKeyOffset = (int)sizeof(uint64_t) - 1;
                 keyOffset++;
             }
         }
@@ -174,7 +174,7 @@ class IntsKey {
             retval |= (0xFF & (data[keyOffset] >> (intraKeyOffset * 8))) << (ii * 8);
             intraKeyOffset--;
             if (intraKeyOffset < 0) {
-                intraKeyOffset = sizeof(uint64_t) - 1;
+                intraKeyOffset = (int)sizeof(uint64_t) - 1;
                 keyOffset++;
             }
         }
@@ -184,7 +184,7 @@ class IntsKey {
     std::string debug( const voltdb::TupleSchema *keySchema) const {
         std::ostringstream buffer;
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = (int)sizeof(uint64_t) - 1;
         const int columnCount = keySchema->columnCount();
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
@@ -222,7 +222,7 @@ class IntsKey {
         const TupleSchema *keySchema = tuple->getSchema();
         const int columnCount = keySchema->columnCount();
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = (int)sizeof(uint64_t) - 1;
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
             case voltdb::VALUE_TYPE_BIGINT: {
@@ -260,7 +260,7 @@ class IntsKey {
         ::memset(data, 0, keySize * sizeof(uint64_t));
         const int columnCount = keySchema->columnCount();
         int keyOffset = 0;
-        int intraKeyOffset = sizeof(uint64_t) - 1;
+        int intraKeyOffset = (int)sizeof(uint64_t) - 1;
         for (int ii = 0; ii < columnCount; ii++) {
             switch(keySchema->columnType(ii)) {
             case voltdb::VALUE_TYPE_BIGINT: {