Changeset 24387 for issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

Timestamp:

11/22/19 08:22:53 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: disconnecting bamg from dataset to speed up compilation

File:

• issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -2 +2 @@
 #include <string.h>
 #include <stdlib.h>
-
 #include "./bamgobjects.h"
-#include "../datastructures/datastructures.h"
 
 namespace bamg {
@@ -68 +66 @@
                 this->NbVertices    = 0;
 
-                /*Create container*/
-                this->boxcontainer=new DataSet();
-
                 /*Create Root, pointer toward the main box*/
                 this->root=NewBamgQuadtreeBox();
@@ -80 +75 @@
                 this->NbQuadtreeBox = 0;
                 this->NbVertices    = 0;
-
-                /*Create container*/
-                this->boxcontainer=new DataSet();
 
                 /*Create Root, pointer toward the main box*/
@@ -99 +91 @@
         /*}}}*/
         BamgQuadtree::~BamgQuadtree() {/*{{{*/
-                delete boxcontainer;
+
+                vector<BamgQuadtreeBox*>::reverse_iterator object;
+                for(object=boxcontainer.rbegin() ; object <boxcontainer.rend(); object++ ){
+                        delete (*object);
+                }
+                boxcontainer.clear();
                 root=NULL;
         }
@@ -514 +511 @@
 
                 /*Add root to the container*/
-                boxcontainer->AddObject(newbox);
+                boxcontainer.push_back(newbox);
                 this->NbQuadtreeBox++;