TimeSeriesPlatformLibrary: Back ported bug fixes and 64-bit improvements to GEP from recent STTP updates.

J. Ritchie Carroll committed 7 years ago

Commit b4c04411 parent 7020fe527 files · +180 −125Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Data/DataTable.cpp (1 of 27 files). Show all

Unified · Split

 void DataTable::AddColumn(DataColumnPtr column)
 {
-    column->m_index = m_columns.size();
+    column->m_index = ConvertInt32(m_columns.size());
     m_columnIndexes.insert(pair<string, int32_t>(column->Name(), column->m_index));
     m_columns.push_back(std::move(column));
 }
 const DataColumnPtr& DataTable::Column(int32_t index) const
 {
-    if (index < 0 || index >= static_cast<int32_t>(m_columns.size()))
+    if (index < 0 || index >= ConvertInt32(m_columns.size()))
         return DataColumn::NullPtr;
     return m_columns[index];
 int32_t DataTable::ColumnCount() const
 {
-    return m_columns.size();
+    return ConvertInt32(m_columns.size());
 }
 const DataRowPtr& DataTable::Row(int32_t index)
 {
-    if (index < 0 || index >= static_cast<int32_t>(m_rows.size()))
+    if (index < 0 || index >= ConvertInt32(m_rows.size()))
         return DataRow::NullPtr;
     return m_rows[index];
 DataRowPtr DataTable::CloneRow(const DataRowPtr& source)
 {
     DataRowPtr row = CreateRow();
+    const int32_t columnCount = ConvertInt32(m_columns.size());
-    for (size_t i = 0; i < m_columns.size(); i++)
+    for (int32_t i = 0; i < columnCount; i++)
     {
         switch (m_columns[i]->m_type)
         {
 int32_t DataTable::RowCount() const
 {
-    return m_rows.size();
+    return ConvertInt32(m_rows.size());
 }

Keyboard shortcuts