Changeset 5150 for issm/trunk/src/c/objects/Bamg/QuadTree.h

Timestamp:

08/11/10 11:47:52 (15 years ago)

Author:

seroussi

Message:

Bamg: put some functions in .ccp

File:

• issm/trunk/src/c/objects/Bamg/QuadTree.h (modified) (4 diffs)

issm/trunk/src/c/objects/Bamg/QuadTree.h

@@ -14 +14 @@
 
         class QuadTree{
+
                 private:
-                        class QuadTreeBox { 
+
+                        class QuadTreeBox{ 
                                 public:
                                         long n; 
@@ -25 +27 @@
                                         };
                         };
-                        class StorageQuadTreeBox {
+                        class StorageQuadTreeBox{
                                 public:
                                         QuadTreeBox *b,*bc,*be;
@@ -41 +43 @@
 
                 public:
+
                         //fields
                         QuadTreeBox* root;
                         Mesh*   th;
+
                         //functions
                         ~QuadTree();
@@ -53 +57 @@
                         BamgVertex* NearestVertexWithNormal(Icoor1 i,Icoor1 j);
                         BamgVertex* ToClose(BamgVertex & ,double ,Icoor1,Icoor1);
-                        long    SizeOf() const {return sizeof(QuadTree)+sb->SizeOf();}
+                        long    SizeOf() const;
                         void    Add( BamgVertex & w);
-                        QuadTreeBox* NewQuadTreeBox(){
+
+                        /*The following function cannot be in the cpp file because QuadTreeBox is
+                         * a private class and is declared before QuadTree::*/
+                        QuadTreeBox* NewQuadTreeBox(void){
                                 if(! (sb->bc<sb->be)) sb=new StorageQuadTreeBox(lenStorageQuadTreeBox,sb);
                                 if (!sb || (sb->bc->n != 0)){ISSMERROR("!sb || (sb->bc->n != 0)");}