mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 13:16:39 +00:00
[Repositories] Add more precise types to repository generator (#2391)
* Make utils/scripts/generators/repository-generator.pl aware of more datatypes This adds support for unsigned and more integer types. It also avoids using parsing functions that require casting (still needed in some cases) Having the data types in the Repository structs better map to the types in the database will allow us to avoid casting when we pull data out of them. And as a benefit, assume something is wrong if we do :) Hopefully clean up some warnings due to casting too. Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
committed by
GitHub
parent
fcf01f6d87
commit
6f7fa98996
@@ -19,10 +19,10 @@
|
||||
class BaseCompletedTasksRepository {
|
||||
public:
|
||||
struct CompletedTasks {
|
||||
int charid;
|
||||
int completedtime;
|
||||
int taskid;
|
||||
int activityid;
|
||||
uint32_t charid;
|
||||
uint32_t completedtime;
|
||||
uint32_t taskid;
|
||||
int32_t activityid;
|
||||
};
|
||||
|
||||
static std::string PrimaryKey()
|
||||
@@ -126,10 +126,10 @@ public:
|
||||
if (results.RowCount() == 1) {
|
||||
CompletedTasks e{};
|
||||
|
||||
e.charid = atoi(row[0]);
|
||||
e.completedtime = atoi(row[1]);
|
||||
e.taskid = atoi(row[2]);
|
||||
e.activityid = atoi(row[3]);
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.completedtime = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.taskid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.activityid = static_cast<int32_t>(atoi(row[3]));
|
||||
|
||||
return e;
|
||||
}
|
||||
@@ -258,10 +258,10 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
CompletedTasks e{};
|
||||
|
||||
e.charid = atoi(row[0]);
|
||||
e.completedtime = atoi(row[1]);
|
||||
e.taskid = atoi(row[2]);
|
||||
e.activityid = atoi(row[3]);
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.completedtime = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.taskid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.activityid = static_cast<int32_t>(atoi(row[3]));
|
||||
|
||||
all_entries.push_back(e);
|
||||
}
|
||||
@@ -286,10 +286,10 @@ public:
|
||||
for (auto row = results.begin(); row != results.end(); ++row) {
|
||||
CompletedTasks e{};
|
||||
|
||||
e.charid = atoi(row[0]);
|
||||
e.completedtime = atoi(row[1]);
|
||||
e.taskid = atoi(row[2]);
|
||||
e.activityid = atoi(row[3]);
|
||||
e.charid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
|
||||
e.completedtime = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
|
||||
e.taskid = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
|
||||
e.activityid = static_cast<int32_t>(atoi(row[3]));
|
||||
|
||||
all_entries.push_back(e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user