From 7bb62cd23de167788b4c3dc330cdf8b5baeddc8c Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 18 Nov 2017 20:12:12 +0100
Subject: Core/DataStores: Updated db2 structures to 7.3.2.25480

---
 src/common/DataStores/DB2FileLoader.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/common/DataStores/DB2FileLoader.cpp')

diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index ce174be43ca..dedab7ee140 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -573,7 +573,6 @@ void DB2FileLoaderRegularImpl::FillCommonValues(char** indexTable)
                     ASSERT(_loadInfo->Meta->Types[field] == FT_SHORT);
                     uint16 value = *reinterpret_cast<uint16*>(commonDataItr);
                     EndianConvert(value);
-                    commonDataItr += sizeof(uint16);
                     for (uint32 arrayIndex = 0; arrayIndex < _loadInfo->Meta->ArraySizes[field]; ++arrayIndex)
                         *reinterpret_cast<uint16*>(&recordData[fieldOffset + sizeof(uint16) * arrayIndex]) = value;
                     break;
@@ -582,7 +581,6 @@ void DB2FileLoaderRegularImpl::FillCommonValues(char** indexTable)
                 {
                     ASSERT(_loadInfo->Meta->Types[field] == FT_BYTE);
                     uint8 value = *reinterpret_cast<uint8*>(commonDataItr);
-                    commonDataItr += sizeof(uint8);
                     for (uint32 arrayIndex = 0; arrayIndex < _loadInfo->Meta->ArraySizes[field]; ++arrayIndex)
                         *reinterpret_cast<uint8*>(&recordData[fieldOffset + sizeof(uint8) * arrayIndex]) = value;
                     break;
@@ -592,7 +590,6 @@ void DB2FileLoaderRegularImpl::FillCommonValues(char** indexTable)
                     ASSERT(_loadInfo->Meta->Types[field] == FT_FLOAT);
                     float value = *reinterpret_cast<float*>(commonDataItr);
                     EndianConvert(value);
-                    commonDataItr += sizeof(float);
                     for (uint32 arrayIndex = 0; arrayIndex < _loadInfo->Meta->ArraySizes[field]; ++arrayIndex)
                         *reinterpret_cast<float*>(&recordData[fieldOffset + sizeof(float) * arrayIndex]) = value;
                     break;
@@ -602,14 +599,16 @@ void DB2FileLoaderRegularImpl::FillCommonValues(char** indexTable)
                     ASSERT(_loadInfo->Meta->Types[field] == FT_INT);
                     uint32 value = *reinterpret_cast<uint32*>(commonDataItr);
                     EndianConvert(value);
-                    commonDataItr += sizeof(uint32);
                     for (uint32 arrayIndex = 0; arrayIndex < _loadInfo->Meta->ArraySizes[field]; ++arrayIndex)
                         *reinterpret_cast<uint32*>(&recordData[fieldOffset + sizeof(uint32) * arrayIndex]) = value;
                     break;
                 }
                 default:
+                    ASSERT(false, "Unhandled common value type %d found in %s", dataType, fileName);
                     break;
             }
+
+            commonDataItr += sizeof(uint32);
         }
 
         switch (_loadInfo->Meta->Types[field])
-- 
cgit v1.2.3