From cb5a9bf6688e3728ac1783422e033b82e55d463b Mon Sep 17 00:00:00 2001 From: wangyix Date: Mon, 14 Jul 2014 10:43:02 -0700 Subject: [PATCH] moved some const defs to avoid redefinition --- libraries/shared/src/SharedUtil.cpp | 3 +++ libraries/shared/src/SharedUtil.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp index 23d33969f4..b5be502ed5 100644 --- a/libraries/shared/src/SharedUtil.cpp +++ b/libraries/shared/src/SharedUtil.cpp @@ -839,6 +839,9 @@ QByteArray createByteArray(const glm::vec3& vector) { } QString formatUsecTime(float usecs, int prec) { + static const quint64 SECONDS_PER_MINUTE = 60; + static const quint64 USECS_PER_MINUTE = USECS_PER_SECOND * SECONDS_PER_MINUTE; + QString result; if (usecs > USECS_PER_MINUTE) { result = QString::number(usecs / USECS_PER_MINUTE, 'f', prec) + "min"; diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h index 81ec2ab810..6bb39f7e12 100644 --- a/libraries/shared/src/SharedUtil.h +++ b/libraries/shared/src/SharedUtil.h @@ -57,9 +57,7 @@ static const float METERS_PER_MILLIMETER = 0.001f; static const float MILLIMETERS_PER_METER = 1000.0f; static const quint64 USECS_PER_MSEC = 1000; static const quint64 MSECS_PER_SECOND = 1000; -static const quint64 SECONDS_PER_MINUTE = 60; static const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND; -static const quint64 USECS_PER_MINUTE = USECS_PER_SECOND * SECONDS_PER_MINUTE; const int BITS_IN_BYTE = 8;