diff options
| author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:30:34 +0000 |
|---|---|---|
| committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:30:34 +0000 |
| commit | 2e80a19863903af01576c11a921c0bb78039049e (patch) | |
| tree | 9f67de1506b1f109006a62c8154ea93160bf8ddb /base/time.h | |
| parent | 861557eb469024cd8a185b98f2b95ac604ea5442 (diff) | |
| download | chromium_src-2e80a19863903af01576c11a921c0bb78039049e.zip chromium_src-2e80a19863903af01576c11a921c0bb78039049e.tar.gz chromium_src-2e80a19863903af01576c11a921c0bb78039049e.tar.bz2 | |
Adding conversion function between base::Time and CFAbsoluteTime
TEST=None
BUG=None
R=mark@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10802018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time.h')
| -rw-r--r-- | base/time.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/base/time.h b/base/time.h index bca9947..97010cb 100644 --- a/base/time.h +++ b/base/time.h @@ -28,6 +28,12 @@ #include "base/base_export.h" #include "base/basictypes.h" +#if defined(OS_MACOSX) +#include <CoreFoundation/CoreFoundation.h> +// Avoid Mac system header macro leak. +#undef TYPE_BOOL +#endif + #if defined(OS_POSIX) // For struct timeval. #include <sys/time.h> @@ -276,6 +282,11 @@ class BASE_EXPORT Time { struct timeval ToTimeVal() const; #endif +#if defined(OS_MACOSX) + static Time FromCFAbsoluteTime(CFAbsoluteTime t); + CFAbsoluteTime ToCFAbsoluteTime() const; +#endif + #if defined(OS_WIN) static Time FromFileTime(FILETIME ft); FILETIME ToFileTime() const; |