diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:04:12 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-08 11:04:12 -0300 |
commit | 568679b7c4c14141aab0c96e4a1ab54afeb9ccac (patch) | |
tree | 1da87f63bf06bfe3932a3caacc743749b4a37140 /core/os | |
parent | ffb57a9183184221fc5e203f636edca4b588e301 (diff) | |
parent | 6b25e83ba73ae3321aff00d7b3192d8cd80c410c (diff) |
Merge pull request #2341 from xodene/patch-5/OS_get_system_time_msec
Add OS.get_system_time_msec
Diffstat (limited to 'core/os')
-rw-r--r-- | core/os/os.cpp | 4 | ||||
-rw-r--r-- | core/os/os.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index f292456079..efcd492230 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -50,7 +50,9 @@ uint64_t OS::get_unix_time() const { return 0; }; - +uint64_t OS::get_system_time_msec() const { + return 0; +} void OS::debug_break() { // something diff --git a/core/os/os.h b/core/os/os.h index 0230a75ca0..e8ecfa1054 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -254,6 +254,7 @@ public: virtual Time get_time(bool local=false) const=0; virtual TimeZoneInfo get_time_zone_info() const=0; virtual uint64_t get_unix_time() const; + virtual uint64_t get_system_time_msec() const; virtual void delay_usec(uint32_t p_usec) const=0; virtual uint64_t get_ticks_usec() const=0; |