Changeset 2724

Timestamp:

Nov 19, 2009, 10:52:45 AM (15 years ago)

Author:

strk

Message:

Don not allocate the container of STRtree node childs on the heap

Location:

trunk/source

Files:

• headers/geos/index/strtree/AbstractNode.h (modified) (1 diff)
• index/strtree/AbstractNode.cpp (modified) (3 diffs)

trunk/source/headers/geos/index/strtree/AbstractNode.h

@@ -38 +38 @@
 class GEOS_DLL AbstractNode: public Boundable {
 private:
-        std::vector<Boundable*> *childBoundables;
+        std::vector<Boundable*> childBoundables;
         int level;
 public:
         AbstractNode(int newLevel, int capacity=10);
         virtual ~AbstractNode();
+
+        // TODO: change signature to return by ref,
+        // document ownership of the return
         inline std::vector<Boundable*>* getChildBoundables() {
-                return childBoundables;
+                return &childBoundables;
         }
 
+        // TODO: change signature to return by ref,
+        // document ownership of the return
         inline const std::vector<Boundable*>* getChildBoundables() const {
-                return childBoundables;
+                return &childBoundables;
         }
 

trunk/source/index/strtree/AbstractNode.cpp

@@ -32 +32 @@
  */
 AbstractNode::AbstractNode(int newLevel, int capacity) {
-        childBoundables=new std::vector<Boundable*>();
-        childBoundables->reserve(capacity);
+        childBoundables.reserve(capacity);
         bounds=NULL;
         level=newLevel;
@@ -39 +38 @@
 
 AbstractNode::~AbstractNode() {
-        delete childBoundables;
 }
-
-/**
-* Returns either child AbstractNodes, or if this is a leaf node, real data (wrapped
-* in ItemBoundables).
-*/
-//vector<Boundable*>* AbstractNode::getChildBoundables() {
-        //return childBoundables;
-//}
 
 const void *
@@ -73 +63 @@
 void AbstractNode::addChildBoundable(Boundable *childBoundable) {
         assert(bounds==NULL);
-        childBoundables->push_back(childBoundable);
+        childBoundables.push_back(childBoundable);
 }