aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/DataStores/DB2FileLoader.cpp5
-rw-r--r--src/common/DataStores/DB2FileLoader.h4
-rw-r--r--src/common/DataStores/DB2Meta.cpp9
-rw-r--r--src/common/DataStores/DB2Meta.h12
4 files changed, 8 insertions, 22 deletions
diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp
index fc5337a452e..c802b96d63b 100644
--- a/src/common/DataStores/DB2FileLoader.cpp
+++ b/src/common/DataStores/DB2FileLoader.cpp
@@ -109,11 +109,6 @@ struct DB2IndexData
std::vector<DB2IndexEntry> Entries;
};
-DB2FieldMeta::DB2FieldMeta(bool isSigned, DBCFormer type, char const* name)
- : IsSigned(isSigned), Type(type), Name(name)
-{
-}
-
DB2FileLoadInfo::DB2FileLoadInfo(DB2FieldMeta const* fields, std::size_t fieldCount, DB2Meta const* meta)
: Fields(fields), FieldCount(fieldCount), Meta(meta)
{
diff --git a/src/common/DataStores/DB2FileLoader.h b/src/common/DataStores/DB2FileLoader.h
index 35bd6a5d644..83e24716e2e 100644
--- a/src/common/DataStores/DB2FileLoader.h
+++ b/src/common/DataStores/DB2FileLoader.h
@@ -66,10 +66,8 @@ struct DB2SectionHeader
#pragma pack(pop)
-struct TC_COMMON_API DB2FieldMeta
+struct DB2FieldMeta
{
- DB2FieldMeta(bool isSigned, DBCFormer type, char const* name);
-
bool IsSigned;
DBCFormer Type;
char const* Name;
diff --git a/src/common/DataStores/DB2Meta.cpp b/src/common/DataStores/DB2Meta.cpp
index 9b35353ce4f..b23dacee34a 100644
--- a/src/common/DataStores/DB2Meta.cpp
+++ b/src/common/DataStores/DB2Meta.cpp
@@ -19,15 +19,6 @@
#include "Common.h"
#include "Errors.h"
-DB2MetaField::DB2MetaField(DBCFormer type, uint8 arraySize, bool isSigned) : Type(type), ArraySize(arraySize), IsSigned(isSigned)
-{
-}
-
-DB2Meta::DB2Meta(uint32 fileDataId, int32 indexField, uint32 fieldCount, uint32 fileFieldCount, uint32 layoutHash, DB2MetaField const* fields, int32 parentIndexField)
- : FileDataId(fileDataId),IndexField(indexField), ParentIndexField(parentIndexField), FieldCount(fieldCount), FileFieldCount(fileFieldCount), LayoutHash(layoutHash), Fields(fields)
-{
-}
-
bool DB2Meta::HasIndexFieldInData() const
{
return IndexField != -1;
diff --git a/src/common/DataStores/DB2Meta.h b/src/common/DataStores/DB2Meta.h
index 953c42d2ea4..7d088f60ba3 100644
--- a/src/common/DataStores/DB2Meta.h
+++ b/src/common/DataStores/DB2Meta.h
@@ -20,18 +20,20 @@
#include "Define.h"
-struct TC_COMMON_API DB2MetaField
+struct DB2MetaField
{
- DB2MetaField(DBCFormer type, uint8 arraySize, bool isSigned);
-
DBCFormer Type;
uint8 ArraySize;
bool IsSigned;
};
-struct TC_COMMON_API DB2Meta
+struct DB2Meta
{
- DB2Meta(uint32 fileDataId, int32 indexField, uint32 fieldCount, uint32 fileFieldCount, uint32 layoutHash, DB2MetaField const* fields, int32 parentIndexField);
+ constexpr explicit DB2Meta(uint32 fileDataId, int32 indexField, uint32 fieldCount, uint32 fileFieldCount, uint32 layoutHash,
+ DB2MetaField const* fields, int32 parentIndexField) : FileDataId(fileDataId), IndexField(indexField), ParentIndexField(parentIndexField),
+ FieldCount(fieldCount), FileFieldCount(fileFieldCount), LayoutHash(layoutHash), Fields(fields)
+ {
+ }
bool HasIndexFieldInData() const;