loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CXX to v1.0.192

Browse Source
This commit is contained in:
Oliver Hamlet
2026-01-01 14:20:11 +00:00
parent bde0ff65e3
commit b9bde27938
9 changed files with 165 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/src/api/convert.cpp
+14 -17
View File
@@ -164,7 +164,7 @@ loot::Vertex convert(const loot::rust::Vertex& vertex) {
std::string(file.GetName()),
file.GetDisplayName(),
file.GetCondition(),
::rust::Slice(convert<loot::rust::MessageContent>(file.GetDetail())),
convert<loot::rust::MessageContent>(file.GetDetail()),
file.GetConstraint());
} catch (const ::rust::Error& e) {
std::rethrow_exception(mapError(e));
@@ -194,8 +194,7 @@ loot::rust::MessageType convert(loot::MessageType messageType) {
try {
return loot::rust::multilingual_message(
convert(message.GetType()),
::rust::Slice(
convert<loot::rust::MessageContent>(message.GetContent())),
convert<loot::rust::MessageContent>(message.GetContent()),
message.GetCondition());
} catch (const ::rust::Error& e) {
std::rethrow_exception(mapError(e));
@@ -219,7 +218,7 @@ loot::rust::MessageType convert(loot::MessageType messageType) {
return loot::rust::new_plugin_cleaning_data(
data.GetCRC(),
data.GetCleaningUtility(),
::rust::Slice(convert<loot::rust::MessageContent>(data.GetDetail())),
convert<loot::rust::MessageContent>(data.GetDetail()),
data.GetITMCount(),
data.GetDeletedReferenceCount(),
data.GetDeletedNavmeshCount());
@@ -242,21 +241,19 @@ loot::rust::MessageType convert(loot::MessageType messageType) {
}
output->set_load_after_files(
::rust::Slice(convert<loot::rust::File>(metadata.GetLoadAfterFiles())));
convert<loot::rust::File>(metadata.GetLoadAfterFiles()));
output->set_requirements(
::rust::Slice(convert<loot::rust::File>(metadata.GetRequirements())));
output->set_incompatibilities(::rust::Slice(
convert<loot::rust::File>(metadata.GetIncompatibilities())));
output->set_messages(
::rust::Slice(convert<loot::rust::Message>(metadata.GetMessages())));
output->set_tags(
::rust::Slice(convert<loot::rust::Tag>(metadata.GetTags())));
output->set_dirty_info(::rust::Slice(
convert<loot::rust::PluginCleaningData>(metadata.GetDirtyInfo())));
output->set_clean_info(::rust::Slice(
convert<loot::rust::PluginCleaningData>(metadata.GetCleanInfo())));
convert<loot::rust::File>(metadata.GetRequirements()));
output->set_incompatibilities(
convert<loot::rust::File>(metadata.GetIncompatibilities()));
output->set_messages(convert<loot::rust::Message>(metadata.GetMessages()));
output->set_tags(convert<loot::rust::Tag>(metadata.GetTags()));
output->set_dirty_info(
convert<loot::rust::PluginCleaningData>(metadata.GetDirtyInfo()));
output->set_clean_info(
convert<loot::rust::PluginCleaningData>(metadata.GetCleanInfo()));
output->set_locations(
::rust::Slice(convert<loot::rust::Location>(metadata.GetLocations())));
convert<loot::rust::Location>(metadata.GetLocations()));
return output;
} catch (const ::rust::Error& e) {
cpp/src/api/convert.h
+7 -2
View File
@@ -83,8 +83,13 @@ std::vector<T> convert(const ::rust::Vec<U>& vec) {
}
template<typename T, typename U>
const std::vector<::rust::Box<T>> convert(const std::vector<U>& vec) {
return convert<::rust::Box<T>, U>(::rust::Slice(vec));
const ::rust::Vec<::rust::Box<T>> convert(const std::vector<U>& vec) {
::rust::Vec<::rust::Box<T>> output;
for (const auto& element : vec) {
output.push_back(convert(element));
}
return output;
}
}
cpp/src/api/database.cpp
+1 -2
View File
@@ -87,8 +87,7 @@ std::vector<Group> Database::GetUserGroups() const {
void Database::SetUserGroups(const std::vector<Group>& groups) {
try {
database_->set_user_groups(
::rust::Slice(convert<loot::rust::Group>(groups)));
database_->set_user_groups(convert<loot::rust::Group>(groups));
} catch (const ::rust::Error& e) {
std::rethrow_exception(mapError(e));
}