Commit 76bfcc2f authored by Laura Schlimmer's avatar Laura Schlimmer
Browse files

Merge remote-tracking branch 'upstream/master'

parents e38c194a 039016c0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public:

protected:

  class Cursor : public sstable::Cursor {
  class Cursor : public ::fnord::sstable::Cursor {
  public:
    Cursor(
        std::shared_ptr<io::MmappedFile> file,