Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the *right* explicit value, cast to the right size, instead of C++11 constant.
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Thu, 23 May 2013 17:10:09 -0700
changeset 9809 290a3bb2f7c9
parent 9808 b8ae2a7f3b0e
child 9810 07a5fd13f3f8
Use the *right* explicit value, cast to the right size, instead of C++11 constant.
src/lte/model/fdbet-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/fdmt-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/fdtbfq-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/pf-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/pss-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/tdbet-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/tdmt-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/tdtbfq-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/model/tta-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions 
--- a/src/lte/model/fdbet-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/fdbet-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1106,7 +1106,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
--- a/src/lte/model/fdmt-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/fdmt-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1077,7 +1077,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1327,7 +1327,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
--- a/src/lte/model/pf-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/pf-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1093,7 +1093,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
--- a/src/lte/model/pss-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/pss-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1392,7 +1392,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
--- a/src/lte/model/tdbet-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/tdbet-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1029,7 +1029,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
--- a/src/lte/model/tdmt-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1056,7 +1056,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,uint8_t>::iterator itCqi;
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1102,7 +1102,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
--- a/src/lte/model/tta-ff-mac-scheduler.cc	Thu May 23 12:39:56 2013 -0700
+++ b/src/lte/model/tta-ff-mac-scheduler.cc	Thu May 23 17:10:09 2013 -0700
@@ -1095,7 +1095,7 @@
       if (lcActives == 0)
         {
           // Set to max value, to avoid divide by 0 below
-          lcActives = 65535; // UINT16_MAX;
+          lcActives = (uint16_t)65535; // UINT16_MAX;
         }
       uint16_t RgbPerRnti = (*itMap).second.size ();
       std::map <uint16_t,SbMeasResult_s>::iterator itCqi;
ns-3.24