3 files changed, 6 insertions, 11 deletions
diff --git a/lib/common/BoxTime.cpp b/lib/common/BoxTime.cpp
index feada309..960fc329 100644
--- a/lib/common/BoxTime.cpp
+++ b/lib/common/BoxTime.cpp
@@ -25,8 +25,7 @@
 // --------------------------------------------------------------------------
 box_time_t GetCurrentBoxTime()
 {
-	ASSERT(sizeof(uint32_t) == sizeof(time_t));
-	return SecondsToBoxTime((uint32_t)time(0));
+	return SecondsToBoxTime(time(0));
 }
 
 
diff --git a/lib/common/BoxTime.h b/lib/common/BoxTime.h
index d166d6e7..398e6b1c 100644
--- a/lib/common/BoxTime.h
+++ b/lib/common/BoxTime.h
@@ -23,19 +23,15 @@ typedef uint64_t	box_time_t;
 
 box_time_t GetCurrentBoxTime();
 
-inline box_time_t SecondsToBoxTime(uint32_t Seconds)
+inline box_time_t SecondsToBoxTime(time_t Seconds)
 {
 	return ((box_time_t)Seconds * MICRO_SEC_IN_SEC_LL);
 }
-inline box_time_t SecondsToBoxTime(uint64_t Seconds)
-{
-	return ((box_time_t)Seconds * MICRO_SEC_IN_SEC_LL);
-}
-inline box_time_t BoxTimeToSeconds(box_time_t Time)
+inline time_t BoxTimeToSeconds(box_time_t Time)
 {
 	return Time / MICRO_SEC_IN_SEC_LL;
 }
-inline box_time_t BoxTimeToMilliSeconds(box_time_t Time)
+inline uint64_t BoxTimeToMilliSeconds(box_time_t Time)
 {
 	return Time / MILLI_SEC_IN_NANO_SEC_LL;
 }
diff --git a/lib/common/BoxTimeToText.cpp b/lib/common/BoxTimeToText.cpp
index 297d2100..ff8b2e49 100644
--- a/lib/common/BoxTimeToText.cpp
+++ b/lib/common/BoxTimeToText.cpp
@@ -29,7 +29,7 @@ std::string BoxTimeToISO8601String(box_time_t Time)
 {
 #ifdef WIN32
 	struct tm *time;
-	box_time_t bob = BoxTimeToSeconds(Time);
+	time_t bob = BoxTimeToSeconds(Time);
 
 	__time64_t winTime = bob;
 
@@ -46,7 +46,7 @@ std::string BoxTimeToISO8601String(box_time_t Time)
 		time->tm_mon + 1, time->tm_mday, time->tm_hour, 
 		time->tm_min, time->tm_sec);
 #else // ! WIN32
-	time_t timeInSecs = (time_t)BoxTimeToSeconds(Time);
+	time_t timeInSecs = BoxTimeToSeconds(Time);
 	struct tm time;
 	gmtime_r(&timeInSecs, &time);