From cbf467e9b5a1503a702cde93d430bac381ddbc8c Mon Sep 17 00:00:00 2001 From: Pasquale Imputato Date: Fri, 27 Apr 2018 19:04:55 +0200 Subject: [PATCH] Remove unused variables to fix build with clang 6 on Linux --- src/core/test/attribute-test-suite.cc | 3 --- src/lte/model/lte-enb-mac.cc | 1 - src/wimax/model/bs-scheduler-rtps.cc | 1 - src/wimax/model/dl-mac-messages.h | 1 - src/wimax/model/snr-to-block-error-rate-manager.cc | 2 -- src/wimax/model/ul-job.h | 6 ------ 6 files changed, 14 deletions(-) diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index 6dc7240da..12482229a 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -54,9 +54,6 @@ public: */ typedef void (* TracedValueCallback)(const ValueClassTest oldValue, const ValueClassTest newValue); - -private: - int m_v; }; diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index f0794151d..35c0dc2f3 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -585,7 +585,6 @@ LteEnbMac::DoSubframeIndication (uint32_t frameNo, uint32_t subframeNo) // --- UPLINK --- // Send UL-CQI info to the scheduler - std::vector ::iterator itCqi; for (uint16_t i = 0; i < m_ulCqiReceived.size (); i++) { if (subframeNo > 1) diff --git a/src/wimax/model/bs-scheduler-rtps.cc b/src/wimax/model/bs-scheduler-rtps.cc index 1689d1a74..23b681520 100644 --- a/src/wimax/model/bs-scheduler-rtps.cc +++ b/src/wimax/model/bs-scheduler-rtps.cc @@ -491,7 +491,6 @@ BSSchedulerRtps::BSSchedulerRTPSConnection (uint32_t &availableSymbols) Time currentTime = Simulator::Now (); - std::vector >::const_iterator iter; std::vector > connections; std::vector::iterator iter2; ServiceFlowRecord *serviceFlowRecord; diff --git a/src/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h index 0216bcbe4..63094f781 100644 --- a/src/wimax/model/dl-mac-messages.h +++ b/src/wimax/model/dl-mac-messages.h @@ -222,7 +222,6 @@ private: uint8_t m_ttg; ///< TTG uint8_t m_rtg; ///< RTG - uint32_t m_chnlSwitchFrameNr; ///< channel switch frame number Mac48Address m_baseStationId; ///< base station ID uint8_t m_frameDurationCode; ///< frame duration code uint32_t m_frameNumber; ///< frame number diff --git a/src/wimax/model/snr-to-block-error-rate-manager.cc b/src/wimax/model/snr-to-block-error-rate-manager.cc index b44427ca8..358b16a1d 100644 --- a/src/wimax/model/snr-to-block-error-rate-manager.cc +++ b/src/wimax/model/snr-to-block-error-rate-manager.cc @@ -306,7 +306,6 @@ SNRToBlockErrorRateManager::GetBlockErrorRate (double SNR, uint8_t modulation) return 0; } - std::vector::const_iterator iter; unsigned int i; for (i = 0; i < record->size (); i++) { @@ -346,7 +345,6 @@ SNRToBlockErrorRateManager::GetSNRToBlockErrorRateRecord (double SNR, record->at (record->size () - 1)->Copy (); } - std::vector::const_iterator iter; unsigned int i; for (i = 0; i < record->size (); i++) { diff --git a/src/wimax/model/ul-job.h b/src/wimax/model/ul-job.h index 35e480956..06ecedb99 100644 --- a/src/wimax/model/ul-job.h +++ b/src/wimax/model/ul-job.h @@ -154,12 +154,6 @@ private: uint32_t m_size; ///< Number of minislots requested enum ServiceFlow::SchedulingType m_schedulingType; ///< Scheduling type of flow - uint8_t m_flag; ///< To delete or not - uint8_t m_retryCount; ///< retry count - double m_ugsJitter; ///< The jitter in the grant, valid only for UGS flows - int m_jitterSamples; ///< jitter samples - double m_last_jitterCalTime; ///< Last time avg jitter was calculated - SSRecord *m_ssRecord; ///< Pointer to SSRecord ReqType m_type; ///< Type of request, DATA or Unicast req slots