diff --git a/examples/tcp/tcp-variants-comparison.cc b/examples/tcp/tcp-variants-comparison.cc index f6a62abae..7cc0769c8 100644 --- a/examples/tcp/tcp-variants-comparison.cc +++ b/examples/tcp/tcp-variants-comparison.cc @@ -300,7 +300,6 @@ int main (int argc, char *argv[]) ApplicationContainer sourceApp = ftp.Install (sources.Get(i)); sourceApp.Start (Seconds (start_time*i)); sourceApp.Stop (Seconds (stop_time - 3)); - Time check_start (Seconds((start_time*i)+3)); sinkHelper.SetAttribute ("Protocol", TypeIdValue (TcpSocketFactory::GetTypeId ())); ApplicationContainer sinkApp = sinkHelper.Install (sinks); diff --git a/examples/wireless/ht-wifi-network.cc b/examples/wireless/ht-wifi-network.cc index efa63f796..ce37eb6b7 100644 --- a/examples/wireless/ht-wifi-network.cc +++ b/examples/wireless/ht-wifi-network.cc @@ -92,7 +92,7 @@ int main (int argc, char *argv[]) Ssid ssid = Ssid ("ns380211n"); - double datarate; + double datarate = 0; StringValue DataRate; if (i==0) { diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc index 96005161a..8e9b8780f 100644 --- a/src/aodv/model/aodv-routing-protocol.cc +++ b/src/aodv/model/aodv-routing-protocol.cc @@ -129,7 +129,6 @@ RoutingProtocol::RoutingProtocol () : AllowedHelloLoss (2), DeletePeriod (Time (5 * std::max (ActiveRouteTimeout, HelloInterval))), NextHopWait (NodeTraversalTime + MilliSeconds (10)), - TimeoutBuffer (2), BlackListTimeout (Time (RreqRetries * NetTraversalTime)), MaxQueueLen (64), MaxQueueTime (Seconds (30)), @@ -202,11 +201,6 @@ RoutingProtocol::GetTypeId (void) TimeValue (Seconds (15)), MakeTimeAccessor (&RoutingProtocol::DeletePeriod), MakeTimeChecker ()) - .AddAttribute ("TimeoutBuffer", "Its purpose is to provide a buffer for the timeout so that if the RREP is delayed" - " due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source.", - UintegerValue (2), - MakeUintegerAccessor (&RoutingProtocol::TimeoutBuffer), - MakeUintegerChecker ()) .AddAttribute ("NetDiameter", "Net diameter measures the maximum possible number of hops between two nodes in the network", UintegerValue (35), MakeUintegerAccessor (&RoutingProtocol::NetDiameter), diff --git a/src/aodv/model/aodv-routing-protocol.h b/src/aodv/model/aodv-routing-protocol.h index fac4ba2b1..e447eae89 100644 --- a/src/aodv/model/aodv-routing-protocol.h +++ b/src/aodv/model/aodv-routing-protocol.h @@ -129,11 +129,6 @@ private: */ Time DeletePeriod; Time NextHopWait; ///< Period of our waiting for the neighbour's RREP_ACK - /** - * The TimeoutBuffer is configurable. Its purpose is to provide a buffer for the timeout so that if the RREP is delayed - * due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source. - */ - uint16_t TimeoutBuffer; Time BlackListTimeout; ///< Time for which the node is put into the blacklist uint32_t MaxQueueLen; ///< The maximum number of packets that we allow a routing protocol to buffer. Time MaxQueueTime; ///< The maximum period of time that a routing protocol is allowed to buffer a packet for. diff --git a/src/buildings/helper/building-position-allocator.h b/src/buildings/helper/building-position-allocator.h index 19e05ef09..e207607df 100644 --- a/src/buildings/helper/building-position-allocator.h +++ b/src/buildings/helper/building-position-allocator.h @@ -95,8 +95,7 @@ public: int64_t AssignStreams (int64_t stream); private: - - bool m_withReplacement; + struct RoomInfo { Ptr b; diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.h b/src/buildings/model/itu-r-1238-propagation-loss-model.h index a3af42dab..8d5d39ad8 100644 --- a/src/buildings/model/itu-r-1238-propagation-loss-model.h +++ b/src/buildings/model/itu-r-1238-propagation-loss-model.h @@ -60,14 +60,6 @@ private: virtual int64_t DoAssignStreams (int64_t stream); double m_frequency; ///< frequency in MHz - double m_lambda; ///< wavelength - EnvironmentType m_environment; - CitySize m_citySize; - double m_rooftopHeight; ///< in meters - double m_streetsOrientation; ///< in degrees [0,90] - double m_streetsWidth; ///< in meters - double m_buildingsExtend; ///< in meters - double m_buildingSeparation; ///< in meters }; diff --git a/src/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc index 4b721d5e2..5c5a7e5de 100644 --- a/src/click/model/ipv4-l3-click-protocol.cc +++ b/src/click/model/ipv4-l3-click-protocol.cc @@ -330,7 +330,7 @@ Ipv4L3ClickProtocol::SetupLoopback (void) // First check whether an existing LoopbackNetDevice exists on the node for (uint32_t i = 0; i < m_node->GetNDevices (); i++) { - if (device = DynamicCast (m_node->GetDevice (i))) + if ((device = DynamicCast (m_node->GetDevice (i)))) { break; } diff --git a/src/core/model/random-variable-stream.h b/src/core/model/random-variable-stream.h index 5b5f855f5..16864a185 100644 --- a/src/core/model/random-variable-stream.h +++ b/src/core/model/random-variable-stream.h @@ -2012,10 +2012,6 @@ private: /// The upper bound on values that can be returned by this RNG stream. double m_max; - - /// It's easier to work with the mode internally instead of the - /// mean. They are related by the simple: mean = (min+max+mode)/3. - double m_mode; }; /** diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index 0d9a84c99..f2e4a1f43 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -225,13 +225,13 @@ private: int8_t DoGetIntSrc (void) const { return m_intSrc2; } bool m_boolTestA; - bool m_boolTest; - int16_t m_int16; - int16_t m_int16WithBounds; + bool NS_UNUSED_GLOBAL (m_boolTest); + int16_t NS_UNUSED_GLOBAL (m_int16); + int16_t NS_UNUSED_GLOBAL (m_int16WithBounds); int16_t m_int16SetGet; - uint8_t m_uint8; - float m_float; - enum Test_e m_enum; + uint8_t NS_UNUSED_GLOBAL (m_uint8); + float NS_UNUSED_GLOBAL (m_float); + enum Test_e NS_UNUSED_GLOBAL (m_enum); Ptr m_random; std::vector > m_vector1; std::vector > m_vector2; diff --git a/src/dsr/model/dsr-maintain-buff.h b/src/dsr/model/dsr-maintain-buff.h index 63960bae1..53486908b 100644 --- a/src/dsr/model/dsr-maintain-buff.h +++ b/src/dsr/model/dsr-maintain-buff.h @@ -204,8 +204,6 @@ private: Ipv4Address m_dst; // / The data ack id uint16_t m_ackId; - // / The ipv4 id - uint16_t m_id; // / The segments left field uint8_t m_segsLeft; // / Expire time for queue entry diff --git a/src/dsr/model/dsr-option-header.cc b/src/dsr/model/dsr-option-header.cc index 4ec71dace..9f44e1e5b 100644 --- a/src/dsr/model/dsr-option-header.cc +++ b/src/dsr/model/dsr-option-header.cc @@ -675,7 +675,6 @@ TypeId DsrOptionRerrHeader::GetInstanceTypeId () const DsrOptionRerrHeader::DsrOptionRerrHeader () : m_errorType (0), - m_reserved (0), m_salvage (0), m_errorLength (4) { @@ -797,7 +796,7 @@ TypeId DsrOptionRerrUnreachHeader::GetInstanceTypeId () const } DsrOptionRerrUnreachHeader::DsrOptionRerrUnreachHeader () - : m_reserved (0), + : m_salvage (0) { SetType (3); @@ -925,7 +924,7 @@ TypeId DsrOptionRerrUnsupportHeader::GetInstanceTypeId () const } DsrOptionRerrUnsupportHeader::DsrOptionRerrUnsupportHeader () - : m_reserved (0), + : m_salvage (0) { SetType (3); diff --git a/src/dsr/model/dsr-option-header.h b/src/dsr/model/dsr-option-header.h index db87c4b3d..1dd4f6d77 100644 --- a/src/dsr/model/dsr-option-header.h +++ b/src/dsr/model/dsr-option-header.h @@ -376,10 +376,6 @@ public: virtual Alignment GetAlignment () const; private: - /** - * \brief The data length. - */ - uint32_t m_dataLength; /** * \brief Identifier of the packet. */ @@ -816,18 +812,10 @@ public: virtual Alignment GetAlignment () const; private: - /** - * \brief option data length - */ - uint8_t m_optDataLen; /** * \brief The error type or route error option */ uint8_t m_errorType; - /** - * \brief The reserved field - */ - uint8_t m_reserved; /** * \brief The salavage field */ @@ -979,18 +967,10 @@ public: virtual Alignment GetAlignment () const; private: - /** - * \brief option data length - */ - uint8_t m_optDataLen; /** * \brief The error type or route error option */ uint8_t m_errorType; - /** - * \brief The reserved field - */ - uint8_t m_reserved; /** * \brief The salavage field */ @@ -1011,10 +991,6 @@ private: * \brief The original destination address */ Ipv4Address m_originalDst; - /** - * \brief The specific error type - */ - uint16_t m_typeSpecific; }; /** @@ -1137,18 +1113,10 @@ public: virtual Alignment GetAlignment () const; private: - /** - * \brief option data length - */ - uint8_t m_optDataLen; /** * \brief The error type or route error option */ uint8_t m_errorType; - /** - * \brief The reserved field - */ - uint8_t m_reserved; /** * \brief The salavage field */ @@ -1244,10 +1212,6 @@ public: virtual Alignment GetAlignment () const; private: - /* - * The option data length - */ - uint8_t m_optDataLen; /* * The identification field */ @@ -1355,10 +1319,6 @@ public: virtual Alignment GetAlignment () const; private: - /** - * \brief option data length - */ - uint8_t m_optDataLen; /** * \brief identification field */ diff --git a/src/dsr/model/dsr-options.h b/src/dsr/model/dsr-options.h index bc1818f2d..276de0e40 100644 --- a/src/dsr/model/dsr-options.h +++ b/src/dsr/model/dsr-options.h @@ -430,10 +430,6 @@ private: * \brief The route cache. */ Ptr m_routeCache; - /** - * \brief The length of the packet. - */ - uint32_t m_length; /** * \brief The ip layer 3. */ @@ -488,10 +484,6 @@ public: virtual uint8_t Process (Ptr packet, Ptr dsrP, Ipv4Address ipv4Address, Ipv4Address source, Ipv4Header const& ipv4Header, uint8_t protocol, bool& isPromisc, Ipv4Address promiscSource); private: - /** - * \brief The length of the packet. - */ - uint32_t m_length; /** * \brief The ip layer 3. */ @@ -561,10 +553,6 @@ private: * \brief The route cache. */ Ptr m_routeCache; - /** - * \brief The length of the packet. - */ - uint32_t m_length; /** * \brief The ipv4 layer 3. */ @@ -623,10 +611,6 @@ private: * \brief The route cache. */ Ptr m_routeCache; - /** - * \brief The length of the packet. - */ - uint32_t m_length; /** * \brief The ipv4 layer 3. */ @@ -685,10 +669,6 @@ private: * \brief The route cache. */ Ptr m_routeCache; - /** - * \brief The length of the packet. - */ - uint32_t m_length; /** * \brief The ipv4 layer 3. */ diff --git a/src/dsr/model/dsr-rreq-table.h b/src/dsr/model/dsr-rreq-table.h index ce0c3089c..7e9ed2eca 100644 --- a/src/dsr/model/dsr-rreq-table.h +++ b/src/dsr/model/dsr-rreq-table.h @@ -238,9 +238,6 @@ public: bool FindSourceEntry (Ipv4Address src, Ipv4Address dst, uint16_t id); private: - - // / The max # of requests to retransmit - uint32_t MaxRequestRexmt; // / The max request period among requests Time MaxRequestPeriod; // / The original request period diff --git a/src/energy/model/rv-battery-model.h b/src/energy/model/rv-battery-model.h index 92af0fdf9..50c2db2b5 100644 --- a/src/energy/model/rv-battery-model.h +++ b/src/energy/model/rv-battery-model.h @@ -225,7 +225,6 @@ private: std::vector m_load; // load profile std::vector