Bug 1374 - Path to solve variable length array of non-POD element
authorGustavo J. A. M. Carneiro <gjcarneiro@gmail.com>
Mon, 12 Mar 2012 15:48:32 +0100
changeset 7761 db874b5c35f7
parent 7760 e98d9c028d7f
child 7762 61b2ef996f45
Bug 1374 - Path to solve variable length array of non-POD element
src/lte/examples/lte-multiple-flows.cc
src/lte/test/lte-propagation-loss-model-test.cc
--- a/src/lte/examples/lte-multiple-flows.cc	Mon Mar 12 11:41:36 2012 +0100
+++ b/src/lte/examples/lte-multiple-flows.cc	Mon Mar 12 15:48:32 2012 +0100
@@ -66,7 +66,7 @@
   Ptr<EnbNetDevice> enb;
   enb = enbDevs.Get (0)->GetObject<EnbNetDevice> ();
 
-  Ptr<UeNetDevice> ue[nbUE];
+  std::vector< Ptr<UeNetDevice> >ue (nbUE);
   for (int i = 0; i < nbUE; i++)
     {
       ue[i] = ueDevs.Get (i)->GetObject<UeNetDevice> ();
--- a/src/lte/test/lte-propagation-loss-model-test.cc	Mon Mar 12 11:41:36 2012 +0100
+++ b/src/lte/test/lte-propagation-loss-model-test.cc	Mon Mar 12 15:48:32 2012 +0100
@@ -170,8 +170,8 @@
   int nbOfValues = tx.size ();
   for (int i = 0; i < nbOfValues; i++)
     {
-      NS_TEST_ASSERT_MSG_EQ (tx.at (i) == 0 && rx.at (i) != 0, false, "Problem with elements of tx and rx.");
-      NS_TEST_ASSERT_MSG_EQ (tx.at (i) != 0 && (tx.at (i) <= rx.at (i)), false, "Problem with elements of tx and rx.");
+      NS_TEST_ASSERT_MSG_EQ ((tx.at (i) == 0 && rx.at (i) != 0), false, "Problem with elements of tx and rx.");
+      NS_TEST_ASSERT_MSG_EQ ((tx.at (i) != 0 && (tx.at (i) <= rx.at (i))), false, "Problem with elements of tx and rx.");
     }