Skip to content

Commit

Permalink
Merge pull request #6777 from realm/nc/fix_timestamp_multiplatform
Browse files Browse the repository at this point in the history
* fix timestamp string representation on different platforms
  • Loading branch information
nicola-cab authored Jul 12, 2023
2 parents 42a84ed + 34b6228 commit b4c8492
Show file tree
Hide file tree
Showing 5 changed files with 14,047 additions and 10,572 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Fixed
* <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)
* Sync errors included the error message twice ([PR #6774](https://github.com/realm/realm-core/pull/6774), since v13.16.0).
* Fix timestamp representation when serializing to json on different platforms. ([#5451](https://github.com/realm/realm-core/issues/5451)).

### Breaking changes
* None.
Expand Down
2 changes: 1 addition & 1 deletion src/realm/obj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ void out_mixed_json(std::ostream& out, const Mixed& val)
}
case type_Timestamp:
out << "\"";
out << val.get<Timestamp>();
out << util::serializer::print_value<Timestamp>(val.get_timestamp());
out << "\"";
break;
case type_Decimal:
Expand Down
Loading

0 comments on commit b4c8492

Please sign in to comment.