Skip to content
Snippets Groups Projects
Commit 8efa0fda authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'fix/deprecation-warnings-date-time-ice-time' into 'master'

Fix deprecated usage of IceUtil::Time

See merge request !300
parents ecd1a529 715f188c
No related branches found
No related tags found
1 merge request!300Fix deprecated usage of IceUtil::Time
......@@ -20,9 +20,9 @@ namespace armarx::armem::server::motions::mdb::conversion
motionReference.associatedInstitution = json["associatedInstitution"];
motionReference.associatedProject = json["associatedProject"];
motionReference.comment = json["comment"];
motionReference.createdDate = IceUtil::Time::seconds(json["createdDate"]);
motionReference.createdDate = DateTime(Duration::Seconds(json["createdDate"]));
motionReference.createdUser = json["createdUser"];
motionReference.modifiedDate = IceUtil::Time::seconds(json["modifiedDate"]);
motionReference.modifiedDate = DateTime(Duration::Seconds(json["modifiedDate"]));
motionReference.modifiedUser = json["modifiedUser"];
motionReference.date = json["date"];
for (auto it = json["attachedFiles"].begin(); it != json["attachedFiles"].end(); ++it)
......@@ -34,7 +34,7 @@ namespace armarx::armem::server::motions::mdb::conversion
{
armarx::motion::mdb::arondto::FileReference fileRef;
fileRef.attachedToId = attachedFile["attachedToId"];
fileRef.createdDate = IceUtil::Time::microSeconds(attachedFile["createdDate"]);
fileRef.createdDate = DateTime(Duration::MicroSeconds(attachedFile["createdDate"]));
fileRef.createdUser = attachedFile["createdUser"];
fileRef.description = attachedFile["description"];
fileRef.fileName = attachedFile["fileName"];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment