Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

odb: write int instead of size_t #5968

Merged
merged 2 commits into from
Oct 24, 2024
Merged

odb: write int instead of size_t #5968

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7a8d2a
odb: write int instead of size_t
gadfort Oct 16, 2024
4039797
odb: fix extra std::size_t write
gadfort Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/odb/src/db/dbMarker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ dbIStream& operator>>(dbIStream& stream, _dbMarker& obj)
stream >> obj.line_number_;
// User Code Begin >>
// handle shapes
std::size_t item_count;
int item_count;
stream >> item_count;
for (std::size_t i = 0; i < item_count; i++) {
std::string db_type;
Expand Down Expand Up @@ -233,14 +233,14 @@ dbOStream& operator<<(dbOStream& stream, const _dbMarker& obj)
stream << obj.line_number_;
// User Code Begin <<
// handle sources
stream << obj.sources_.size();
stream << static_cast<int>(obj.sources_.size());
for (const auto& [db_type, dbid] : obj.sources_) {
stream << std::string(dbObject::getTypeName(db_type));
stream << dbid;
}

// handle shapes
stream << obj.shapes_.size();
stream << static_cast<int>(obj.shapes_.size());
for (const dbMarker::MarkerShape& shape : obj.shapes_) {
if (std::holds_alternative<Point>(shape)) {
stream << _dbMarker::ShapeType::Point;
Expand Down
Loading