Commit 17e486f3 authored by eddietwo's avatar eddietwo

fixes for newer GCCs: remove redundant "class"es

parent 4905069c
......@@ -340,10 +340,10 @@ private:
// 3. expired routes *are* allowed in the table, since that's what
// the DSDV description does.
class RTable _rtes;
RTable _rtes;
#if USE_OLD_SEQ
class RTable _old_rtes;
RTable _old_rtes;
bool use_old_route(const IPAddress &dst, unsigned jiff);
#endif
......@@ -373,8 +373,8 @@ private:
// has a running timer in _expire_timers. No broken routes have a
// timer. Every entry in _expire_timers has a corresponding
// TimerHook pointer stored in _expire_hooks.
class TMap _expire_timers;
class HMap _expire_hooks;
TMap _expire_timers;
HMap _expire_hooks;
// Trigger timer invariants: any route may have a timer in this
// table. All timers in the table must be running. Every entry in
......@@ -388,8 +388,8 @@ private:
// destinations whose triggered updates were cancelled when r's
// trigger was delayed, and which should be advertised when r's
// triggered update timer finally fires, even if r needn't be.
class TMap _trigger_timers;
class HMap _trigger_hooks;
TMap _trigger_timers;
HMap _trigger_hooks;
// check table, timer, and trigger hook invariants
void check_invariants(const IPAddress *ignore = 0) const;
......@@ -402,11 +402,11 @@ private:
unsigned int _jitter; // msecs
unsigned int _min_triggered_update_period; // msecs
class GridGatewayInfo *_gw_info;
class GridGenericMetric *_metric;
GridGatewayInfo *_gw_info;
GridGenericMetric *_metric;
/* binary logging */
class GridGenericLogger *_log;
GridGenericLogger *_log;
static const unsigned int _log_dump_period = 5 * 1000; // msecs
/* this node's addresses */
......@@ -431,11 +431,11 @@ private:
/* Keep and propagate route with invalid metrics? */
bool _ignore_invalid_routes;
class Timer _hello_timer;
Timer _hello_timer;
static void static_hello_hook(Timer *, void *e) { ((DSDVRouteTable *) e)->hello_hook(); }
void hello_hook();
class Timer _log_dump_timer;
Timer _log_dump_timer;
static void static_log_dump_hook(Timer *, void *e) { ((DSDVRouteTable *) e)->log_dump_hook(true); }
void log_dump_hook(bool reschedule);
......@@ -518,9 +518,9 @@ private:
#if ENABLE_PAUSE
bool _paused;
unsigned _snapshot_jiffies;
class RTable _snapshot_rtes;
RTable _snapshot_rtes;
#if USE_OLD_SEQ
class RTable _snapshot_old_rtes;
RTable _snapshot_old_rtes;
#endif
#endif
......
......@@ -39,7 +39,7 @@ class GridProxy : public Element {
};
typedef HashMap<IPAddress, DstInfo> ProxyMap;
class ProxyMap _map;
ProxyMap _map;
click_ip _iph;
uatomic32_t _id;
......
......@@ -119,9 +119,9 @@ class AutoRateFallback : public Element { public:
typedef HashMap<EtherAddress, DstInfo> NeighborTable;
typedef NeighborTable::const_iterator NIter;
class NeighborTable _neighbors;
NeighborTable _neighbors;
class AvailableRates *_rtable;
AvailableRates *_rtable;
bool _alt_rate;
bool _active;
};
......
......@@ -54,7 +54,7 @@ class Defragment : public Element { public:
typedef HashMap<int, PacketInfo> PacketInfoTable;
typedef PacketInfoTable::const_iterator PIIter;
class PacketInfoTable _packets;
PacketInfoTable _packets;
bool _debug;
private:
......
......@@ -50,7 +50,7 @@ class FragmentAck : public Element { public:
typedef HashMap<EtherAddress, WindowInfo> FragTable;
typedef FragTable::const_iterator FIter;
class FragTable _frags;
FragTable _frags;
EtherAddress _en;
unsigned _et;
......
......@@ -40,7 +40,7 @@ class FragmentDupeFilter : public Element { public:
typedef HashMap<EtherAddress, DstInfo> FragTable;
typedef FragTable::const_iterator FIter;
class FragTable _frags;
FragTable _frags;
EtherAddress _en;
unsigned _et;
......
......@@ -66,7 +66,7 @@ class FragmentResender : public Element { public:
typedef PacketInfoTable::const_iterator PIIter;
class PacketInfoTable _packets;
PacketInfoTable _packets;
bool _debug;
unsigned _et;
......
......@@ -90,7 +90,7 @@ class LinkFailureDetection : public Element { public:
typedef HashMap<EtherAddress, DstInfo> NeighborTable;
typedef NeighborTable::const_iterator NIter;
class NeighborTable _neighbors;
NeighborTable _neighbors;
EtherAddress _bcast;
int _tau;
......
......@@ -465,7 +465,7 @@ LinkTable::print_hosts()
void
LinkTable::clear_stale() {
class LTable links;
LTable links;
for (LTIter iter = _links.begin(); iter; iter++) {
LinkInfo nfo = iter.value();
if ((unsigned) _stale_timeout.tv_sec >= nfo.age()) {
......
......@@ -126,7 +126,7 @@ public:
typedef HashMap<IPAddress, IPAddress> IPTable;
typedef IPTable::const_iterator IPIter;
class IPTable _blacklist;
IPTable _blacklist;
struct timeval dijkstra_time;
private:
......@@ -237,8 +237,8 @@ private:
typedef HashMap<IPPair, LinkInfo> LTable;
typedef LTable::const_iterator LTIter;
class HTable _hosts;
class LTable _links;
HTable _hosts;
LTable _links;
IPAddress _ip;
......
......@@ -123,9 +123,9 @@ class MadwifiRate : public Element { public:
typedef HashMap<EtherAddress, DstInfo> NeighborTable;
typedef NeighborTable::const_iterator NIter;
class NeighborTable _neighbors;
NeighborTable _neighbors;
class AvailableRates *_rtable;
AvailableRates *_rtable;
bool _alt_rate;
bool _active;
};
......
......@@ -7,6 +7,7 @@
#include <click/glue.hh>
#include <clicknet/wifi.h>
CLICK_DECLS
class AvailableRates;
/*
=c
......@@ -276,12 +277,12 @@ class ProbeTXRate : public Element { public:
typedef HashMap<EtherAddress, DstInfo> NeighborTable;
typedef NeighborTable::const_iterator NIter;
class NeighborTable _neighbors;
NeighborTable _neighbors;
EtherAddress _bcast;
int _rate_window_ms;
struct timeval _rate_window;
class AvailableRates *_rtable;
AvailableRates *_rtable;
bool _filter_low_rates;
bool _filter_never_success;
bool _aggressive_alt_rate;
......
......@@ -70,7 +70,7 @@ class RXStats : public Element { public:
typedef HashMap<EtherAddress, DstInfo> NeighborTable;
typedef NeighborTable::const_iterator NIter;
class NeighborTable _neighbors;
NeighborTable _neighbors;
EtherAddress _bcast;
int _tau;
......
......@@ -29,7 +29,7 @@ class CheckSRHeader : public Element {
typedef HashMap<EtherAddress, uint8_t> BadTable;
typedef BadTable::const_iterator BTIter;
class BadTable _bad_table;
BadTable _bad_table;
int _drops;
public:
......
......@@ -256,7 +256,7 @@ public:
typedef HashMap<EtherAddress, uint8_t> BadTable;
typedef BadTable::const_iterator BTIter;
class BadTable _bad_table;
BadTable _bad_table;
public:
String bad_nodes();
......
......@@ -63,7 +63,7 @@ public:
typedef IPInfoTable::const_iterator IPIter;
class IPInfoTable _table;
IPInfoTable _table;
bool _track_src;
bool _track_dst;
......
......@@ -107,7 +107,7 @@ private:
typedef HashMap<IPFlowID, FlowTableEntry> FlowTable;
typedef FlowTable::const_iterator FTIter;
class FlowTable _flow_table;
FlowTable _flow_table;
IPAddress _gw;
void push_fwd(Packet *, IPAddress);
......
......@@ -89,9 +89,9 @@ class BeaconScanner : public Element { public:
typedef HashMap<EtherAddress, wap> APTable;
typedef APTable::const_iterator APIter;
class APTable _waps;
class AvailableRates *_rtable;
class WirelessInfo *_winfo;
APTable _waps;
AvailableRates *_rtable;
WirelessInfo *_winfo;
};
CLICK_ENDDECLS
......
......@@ -68,7 +68,7 @@ private:
typedef TXNeighborTable::const_iterator TXNIter;
class TXNeighborTable _neighbors;
TXNeighborTable _neighbors;
EtherAddress _eth;
EtherAddress _bcast;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment