Additional static casts needed for gcc-4.7 compilation
authorVedran Mileti? <rivanvx@gmail.com>
Thu, 08 Mar 2012 21:50:10 -0800
changeset 7757 c8568ed95192
parent 7756 a3a5f9215aae
child 7758 c678188af993
Additional static casts needed for gcc-4.7 compilation
src/core/model/calendar-scheduler.cc
--- a/src/core/model/calendar-scheduler.cc	Thu Mar 08 21:48:19 2012 -0800
+++ b/src/core/model/calendar-scheduler.cc	Thu Mar 08 21:50:10 2012 -0800
@@ -125,7 +125,7 @@
   NS_ASSERT (!IsEmpty ());
   uint32_t i = m_lastBucket;
   uint64_t bucketTop = m_bucketTop;
-  Scheduler::Event minEvent = { 0, { ~0, ~0}};
+  Scheduler::Event minEvent = { static_cast<uint64_t>(0), { static_cast<uint32_t>(~0), static_cast<uint32_t>(~0)}};
   do
     {
       if (!m_buckets[i].empty ())
@@ -154,7 +154,7 @@
 {
   uint32_t i = m_lastBucket;
   uint64_t bucketTop = m_bucketTop;
-  Scheduler::Event minEvent = { 0, { ~0, ~0}};
+  Scheduler::Event minEvent = { static_cast<uint64_t>(0), { static_cast<uint32_t>(~0), static_cast<uint32_t>(~0)}};
   do
     {
       if (!m_buckets[i].empty ())