diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2015-11-24 14:46:13 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2015-11-25 19:17:46 +0000 |
| commit | 3bfb13d1a7a1d1677b3b3af9264f7cbecb6b71bd (patch) | |
| tree | f5157604bf8f47280adf8c84f98d07bc78d669b1 /third_party | |
| parent | c4305600835b91630f9ca4b10ad9070ea55a726c (diff) | |
| download | libweave-3bfb13d1a7a1d1677b3b3af9264f7cbecb6b71bd.tar.gz | |
Fix GCC 4.7 errors
GCC 4.7.2 fail overriding constructors defined with virtual and default.
Debian build also fails linking without -lrt.
INT64_C is not defined on Debian with 4.7.2. "ll" should be enough.
Change-Id: Ia779f094ed64fc3b1941429485e81520d017c2f5
Reviewed-on: https://weave-review.googlesource.com/1671
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/chromium/base/time/time_posix.cc | 2 | ||||
| -rw-r--r-- | third_party/chromium/base/time/time_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/chromium/base/time/time_posix.cc b/third_party/chromium/base/time/time_posix.cc index b625af6..2825ce5 100644 --- a/third_party/chromium/base/time/time_posix.cc +++ b/third_party/chromium/base/time/time_posix.cc @@ -117,7 +117,7 @@ struct timespec TimeDelta::ToTimeSpec() const { // => Thu Jan 01 00:00:00 UTC 1970 // irb(main):011:0> Time.at(-11644473600).getutc() // => Mon Jan 01 00:00:00 UTC 1601 -static const int64 kWindowsEpochDeltaSeconds = INT64_C(11644473600); +static const int64 kWindowsEpochDeltaSeconds = 11644473600ll; // static const int64 Time::kWindowsEpochDeltaMicroseconds = diff --git a/third_party/chromium/base/time/time_unittest.cc b/third_party/chromium/base/time/time_unittest.cc index 43373e7..508244a 100644 --- a/third_party/chromium/base/time/time_unittest.cc +++ b/third_party/chromium/base/time/time_unittest.cc @@ -584,7 +584,7 @@ TEST(TimeDelta, WindowsEpoch) { exploded.millisecond = 0; Time t = Time::FromUTCExploded(exploded); // Unix 1970 epoch. - EXPECT_EQ(INT64_C(11644473600000000), t.ToInternalValue()); + EXPECT_EQ(11644473600000000ll, t.ToInternalValue()); // We can't test 1601 epoch, since the system time functions on Linux // only compute years starting from 1900. |