From 0dacfa4764aebfc5a716c3955963871d8166c56b Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Fri, 22 Jul 2016 10:16:18 -0700 Subject: [PATCH] Rename GetTickCount to GetClockTickCount Summary: Because Windows already defines a funtion named `GetTickCount` with a different signature. Reviewed By: yfeldblum Differential Revision: D3601877 fbshipit-source-id: fa0fb422156a3dc71e149e02a000ccdf3479eea5 --- folly/test/SpookyHashV1Test.cpp | 22 +++++++++++----------- folly/test/SpookyHashV2Test.cpp | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp index 47920a60..9748a759 100644 --- a/folly/test/SpookyHashV1Test.cpp +++ b/folly/test/SpookyHashV1Test.cpp @@ -36,7 +36,7 @@ using namespace ::folly::hash; static bool failed = false; -static uint64_t GetTickCount() { +static uint64_t GetClockTickCount() { timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; // milliseconds @@ -273,41 +273,41 @@ void DoTimingBig(int seed) memset(buf[i], (char)seed, BUFSIZE); } - uint64_t a = GetTickCount(); + uint64_t a = GetClockTickCount(); uint64_t hash1 = seed; uint64_t hash2 = seed; for (uint64_t i=0; i