diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-15 23:57:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 23:57:16 +0200 |
| commit | 4b5b60de85fd264c57ef2dd90d0281cd8b4c05e1 (patch) | |
| tree | 6b27343a22a160951328cb3ee48467421b41f668 /drivers/unix/os_unix.h | |
| parent | e606b510aed533638a00180b6c00f2231da15175 (diff) | |
| parent | c6de3872f922256c9149f83067c9bef79566775b (diff) | |
| download | redot-engine-4b5b60de85fd264c57ef2dd90d0281cd8b4c05e1.tar.gz | |
Merge pull request #39189 from touilleMan/issue-38925
Unify OS.get_system_time_* and OS.get_unix_time
Diffstat (limited to 'drivers/unix/os_unix.h')
| -rw-r--r-- | drivers/unix/os_unix.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 7d235803dc..2982e0c55c 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -77,9 +77,7 @@ public: virtual Time get_time(bool utc) const; virtual TimeZoneInfo get_time_zone_info() const; - virtual uint64_t get_unix_time() const; - virtual uint64_t get_system_time_secs() const; - virtual uint64_t get_system_time_msecs() const; + virtual double get_unix_time() const; virtual void delay_usec(uint32_t p_usec) const; virtual uint64_t get_ticks_usec() const; |