[Click] linktable.hh error

[Bob Keyes]

gcc/g++ version 3.3.4, debian 1:3.3.4-2


./configure --enable-wifi --with-wifi=/home/bobk/madwifi.stripped \
--enable-linuxmodule --with-linux=/usr/src/kernel-source-2.4.20 \
--disable-adaptive


g++ -W -Wall -fno-exceptions -fno-rtti  -DHAVE_CONFIG_H -I../include
-I../include -I. -I..  -DCLICK_USERLEVEL -g -O2 -MD -c
../elements/wifi/linktable.cc
In file included from ../elements/wifi/linktable.cc:19:
../elements/wifi/linktable.hh:171: error: parse error before `<<' token
../elements/wifi/linktable.hh:181: error: ISO C++ forbids declaration of `
   HostInfo' with no type

(and cascading errors from there)

relevant lines from linktable.hh, 165-182:

      _metric = metric;
      click_gettimeofday(&_last_updated);
    }

  };

<<<<<<< linktable.hh

=======
>>>>>>> 1.3
  class HostInfo {
  public:
    IPAddress _ip;
    int _metric;
    IPAddress _prev;
    bool _marked;
    HostInfo() { _ip = IPAddress(); _prev = IPAddress(); _metric = 0;
_marked =
false;}
    HostInfo(IPAddress p) { _ip = p; _prev = IPAddress(); _metric = 0;
_marked = false; }