aboutsummaryrefslogtreecommitdiff
path: root/src/common/DataStores/DB2FileLoader.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-06-07 17:23:50 +0200
committerShauren <shauren.trinity@gmail.com>2017-06-07 17:23:50 +0200
commit4226eb2ea56a13f1e499b80e51cb73748cff82a1 (patch)
tree3cf644eaebb18b2426583c948d163d14176a220b /src/common/DataStores/DB2FileLoader.cpp
parent7e9a0414708ed1f9373c4c0e87ade501d3f7bc98 (diff)
Core/Misc: Some /W4 warning fixes
Diffstat (limited to 'src/common/DataStores/DB2FileLoader.cpp')
-rw-r--r--src/common/DataStores/DB2FileLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index 0dc9edb19f0..6e2b455f48d 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -1125,7 +1125,7 @@ uint32 DB2FileLoaderSparseImpl::RecordGetVarInt(unsigned char const* record, uin
uint16 DB2FileLoaderSparseImpl::GetFieldOffset(uint32 field, uint32 arrayIndex) const
{
- return _fieldAndArrayOffsets[_fieldAndArrayOffsets[field] + arrayIndex];
+ return uint16(_fieldAndArrayOffsets[_fieldAndArrayOffsets[field] + arrayIndex]);
}
uint16 DB2FileLoaderSparseImpl::GetFieldSize(uint32 field) const
@@ -1139,7 +1139,7 @@ std::size_t* DB2FileLoaderSparseImpl::RecordCreateDetachedFieldOffsets(std::size
if (oldOffsets != _fieldAndArrayOffsets)
return oldOffsets;
- uint32 size = _loadInfo->Meta->FieldCount + _loadInfo->FieldCount - (!_loadInfo->Meta->HasIndexFieldInData() ? 1 : 0);
+ std::size_t size = _loadInfo->Meta->FieldCount + _loadInfo->FieldCount - (!_loadInfo->Meta->HasIndexFieldInData() ? 1 : 0);
std::size_t* newOffsets = new std::size_t[size];
memcpy(newOffsets, _fieldAndArrayOffsets, size * sizeof(std::size_t));
return newOffsets;