Merge remote-tracking branch 'origin/master' into topic/robin/pktsrc

This commit is contained in:
Robin Sommer 2014-09-08 14:02:49 -07:00
commit 265438b84c
6 changed files with 8 additions and 6 deletions

View file

@ -10,9 +10,7 @@ namespace pcap {
class PcapSource : public iosource::PktSrc {
public:
// XXX
PcapSource(const std::string& path, bool is_live);
virtual ~PcapSource();
static PktSrc* Instantiate(const std::string& path, bool is_live);