henry/SimCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: resolved confilcts

Browse Source
This commit is contained in:
Henry Winkel
2023-08-11 09:13:49 +02:00
parent 30a8f3cd58
commit 5fb2c390b3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/SimCore/data.hpp
View File

@@ -16,15 +16,11 @@ namespace SimCore
}
Data(T val):data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
Data(T val):mx(),data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
{
}
Data(T val):data_(val),valid_(false),writeTime_(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count())
{
}
Data (const Data &other)
{