Not ready for LinkedPtr removal yet....

2 files changed, 9 insertions, 8 deletions

diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index 0b0b9b17f90..bf1622cd84c 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -140,12 +140,12 @@ public:
     CheckAttributeReferences() : _numrefs(0) { }
     int _numrefs;
 private:
-    virtual void execute(vespalib::Identifiable &obj) {
+    void execute(vespalib::Identifiable &obj) override {
         if (static_cast<AttributeNode &>(obj).getAttribute() != NULL) {
             _numrefs++;
         }
     }
-    virtual bool check(const vespalib::Identifiable &obj) const { return obj.inherits(AttributeNode::classId); }
+    bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(AttributeNode::classId); }
 };
 
 struct DoomFixture {
@@ -305,9 +305,9 @@ TEST_F("testGroupingSession", DoomFixture()) {
 
     CheckAttributeReferences attrCheck;
     request1.select(attrCheck, attrCheck);
-    EXPECT_EQUAL(attrCheck._numrefs, 0);
+    EXPECT_EQUAL(0u, attrCheck._numrefs);
     request2.select(attrCheck, attrCheck);
-    EXPECT_EQUAL(attrCheck._numrefs, 0);
+    EXPECT_EQUAL(0u, attrCheck._numrefs);
 
     GroupingContext::GroupingPtr r1(new Grouping(request1));
     GroupingContext::GroupingPtr r2(new Grouping(request2));
@@ -320,10 +320,11 @@ TEST_F("testGroupingSession", DoomFixture()) {
     GroupingSession session(id, initContext, world.attributeContext);
     CheckAttributeReferences attrCheck2;
     GroupingList &gl2(initContext.getGroupingList());
+    EXPECT_EQUAL(2u, gl2.size());
     for (unsigned int i = 0; i < gl2.size(); i++) {
         gl2[i]->select(attrCheck2, attrCheck2);
     }
-    EXPECT_EQUAL(attrCheck2._numrefs, 10);
+    EXPECT_EQUAL(10u, attrCheck2._numrefs);
     RankedHit hit;
     hit._docId = 0;
     GroupingManager &manager(session.getGroupingManager());
diff --git a/searchcore/src/vespa/searchcore/grouping/groupingcontext.h b/searchcore/src/vespa/searchcore/grouping/groupingcontext.h
index e79408fc6a3..271519ebd7a 100644
--- a/searchcore/src/vespa/searchcore/grouping/groupingcontext.h
+++ b/searchcore/src/vespa/searchcore/grouping/groupingcontext.h
@@ -18,9 +18,9 @@ namespace grouping {
 class GroupingContext
 {
 public:
-    typedef std::unique_ptr<GroupingContext>               UP;
-    typedef std::shared_ptr<search::aggregation::Grouping> GroupingPtr;
-    typedef std::vector<GroupingPtr>                       GroupingList;
+    using UP = std::unique_ptr<GroupingContext>;
+    using  GroupingPtr =  std::shared_ptr<search::aggregation::Grouping>;
+    using GroupingList = std::vector<GroupingPtr>;
 
 private:
     GroupingContext &operator=(const GroupingContext &);