From 7d0a0beae95a1fcddd5ced2285c78e9f9ce0bcab Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 26 Mar 2017 13:42:57 +0300 Subject: [PATCH] Use standard stdint.h spelling for integer types --- src/internet/test/ipv4-global-routing-test-suite.cc | 2 +- src/lte/test/lte-test-carrier-aggregation.cc | 2 +- src/lte/test/lte-test-carrier-aggregation.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/internet/test/ipv4-global-routing-test-suite.cc b/src/internet/test/ipv4-global-routing-test-suite.cc index 6723e003d..af33887ed 100644 --- a/src/internet/test/ipv4-global-routing-test-suite.cc +++ b/src/internet/test/ipv4-global-routing-test-suite.cc @@ -855,7 +855,7 @@ private: void HandleRead (Ptr socket); virtual void DoRun (void); - u_int16_t m_count; //!< Number of packets received. + uint16_t m_count; //!< Number of packets received. std::vector, bool> > m_sendSocks; //!< Sending sockets. DataRate m_dataRate; //!< Data rate. uint16_t m_packetSize; //!< Packet size. diff --git a/src/lte/test/lte-test-carrier-aggregation.cc b/src/lte/test/lte-test-carrier-aggregation.cc index 6b3baae71..84e6a60f3 100644 --- a/src/lte/test/lte-test-carrier-aggregation.cc +++ b/src/lte/test/lte-test-carrier-aggregation.cc @@ -251,7 +251,7 @@ CarrierAggregationTestCase::BuildNameString (uint16_t nUser, uint16_t dist, uint return oss.str (); } -CarrierAggregationTestCase::CarrierAggregationTestCase (uint16_t nUser, uint16_t dist, uint32_t dlbandwidth, uint32_t ulBandwidth, uint numberOfComponentCarriers) +CarrierAggregationTestCase::CarrierAggregationTestCase (uint16_t nUser, uint16_t dist, uint32_t dlbandwidth, uint32_t ulBandwidth, uint32_t numberOfComponentCarriers) : TestCase (BuildNameString (nUser, dist, dlbandwidth, ulBandwidth, numberOfComponentCarriers)), m_nUser (nUser), m_dist (dist), diff --git a/src/lte/test/lte-test-carrier-aggregation.h b/src/lte/test/lte-test-carrier-aggregation.h index 3a4d09fb7..7d0491981 100644 --- a/src/lte/test/lte-test-carrier-aggregation.h +++ b/src/lte/test/lte-test-carrier-aggregation.h @@ -57,7 +57,7 @@ public: * \param ulBandwidth the UL badnwidth * \param numberOfComponentCarriers number of component carriers to be used in test configuration */ - CarrierAggregationTestCase (uint16_t nUser, uint16_t dist, uint32_t dlbandwidth, uint32_t ulBandwidth, uint numberOfComponentCarriers); + CarrierAggregationTestCase (uint16_t nUser, uint16_t dist, uint32_t dlbandwidth, uint32_t ulBandwidth, uint32_t numberOfComponentCarriers); virtual ~CarrierAggregationTestCase (); /** * DL Scheduling function that is used in this test as callback function of DL scheduling trace