Merge lp:~zorba-coders/zorba/simple-collection-api-2 into lp:zorba

[Ghislain Fourny]

Making two non-abstract functions in simplecollection API also non-virtual.

Making two non-abstract functions in simplecollection API also non-virtual.

[Ghislain Fourny (gislenius)]

Markos: this addresses your comment in the simple-collection-api merge proposal.

[Zorba Build Bot (zorba-buildbot)]

No approved revision specified.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/simple-collection-api-2-2012-03-05T19-58-05.31Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job simple-collection-api-2-2012-03-05T19-58-05.31Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/collection.h'
--- src/store/naive/collection.h	2012-03-01 14:16:27 +0000
+++ src/store/naive/collection.h	2012-03-05 15:56:19 +0000
@@ -99,14 +99,14 @@
       const store::Item* name,
       std::vector<store::Index*>& indexes);
 
-  virtual void getIndexes(std::vector<store::Index*>& indexes);
+  void getIndexes(std::vector<store::Index*>& indexes);
 
   /**** Returns active integrity constraints referencing this collection ******/
   static void getActiveICs(
       const store::Item* name,
       std::vector<store::IC*>& ics);
 
-  virtual void getActiveICs(std::vector<store::IC*>& ics);
+  void getActiveICs(std::vector<store::IC*>& ics);
 
 }; /* class Collection */