[MOAB-dev] r2826 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-04-15 12:42:46 -0500 (Wed, 15 Apr 2009)
New Revision: 2826

Modified:
   MOAB/trunk/ScdElementData.hpp
   MOAB/trunk/SweptElementData.cpp
   MOAB/trunk/SweptElementData.hpp
Log:
fix build errors

Modified: MOAB/trunk/ScdElementData.hpp
===================================================================
--- MOAB/trunk/ScdElementData.hpp	2009-04-15 16:23:12 UTC (rev 2825)
+++ MOAB/trunk/ScdElementData.hpp	2009-04-15 17:42:46 UTC (rev 2826)
@@ -37,6 +37,9 @@
 #include <vector>
 #include <algorithm>
 
+class ScdElementData : public SequenceData
+{
+
   //! structure to hold references to bounding vertex blocks
 class VertexDataRef
 {
@@ -53,9 +56,6 @@
   bool contains(const HomCoord &coords) const;
 };
 
-class ScdElementData : public SequenceData
-{
-
 private:
 
     //! parameter min/max/stride, in homogeneous coords ijkh
@@ -205,12 +205,12 @@
   return (temp >= elementParams[0] && temp < elementParams[1]);
 }
   
-inline bool VertexDataRef::contains(const HomCoord &coords) const 
+inline bool ScdElementData::VertexDataRef::contains(const HomCoord &coords) const 
 {
   return (minmax[0] <= coords && minmax[1] >= coords);
 }
 
-inline VertexDataRef::VertexDataRef(const HomCoord &this_min, const HomCoord &this_max,
+inline ScdElementData::VertexDataRef::VertexDataRef(const HomCoord &this_min, const HomCoord &this_max,
                                     const HomXform &tmp_xform, ScdVertexData *this_seq)
     : xform(tmp_xform), invXform(tmp_xform.inverse()), srcSeq(this_seq)
 {

Modified: MOAB/trunk/SweptElementData.cpp
===================================================================
--- MOAB/trunk/SweptElementData.cpp	2009-04-15 16:23:12 UTC (rev 2825)
+++ MOAB/trunk/SweptElementData.cpp	2009-04-15 17:42:46 UTC (rev 2826)
@@ -39,7 +39,6 @@
                              const int imin, const int jmin, const int kmin,
                              const int imax, const int jmax, const int kmax,
 			     const int* Cq ) 
-) 
     : SequenceData(0, start_handle,
                    start_handle + 
                    calc_num_entities( start_handle, imax-imin, jmax-jmin, kmax-kmin )

Modified: MOAB/trunk/SweptElementData.hpp
===================================================================
--- MOAB/trunk/SweptElementData.hpp	2009-04-15 16:23:12 UTC (rev 2825)
+++ MOAB/trunk/SweptElementData.hpp	2009-04-15 17:42:46 UTC (rev 2826)
@@ -37,6 +37,9 @@
 #include <vector>
 #include <algorithm>
 
+class SweptElementData : public SequenceData
+{
+
   //! structure to hold references to bounding vertex blocks
 class VertexDataRef
 {
@@ -53,9 +56,6 @@
   bool contains(const HomCoord &coords) const;
 };
 
-class SweptElementData : public SequenceData
-{
-
 private:
 
     //! parameter min/max/stride, in homogeneous coords ijkh
@@ -206,12 +206,12 @@
   return (temp >= elementParams[0] && temp < elementParams[1]);
 }
   
-inline bool VertexDataRef::contains(const HomCoord &coords) const 
+inline bool SweptElementData::VertexDataRef::contains(const HomCoord &coords) const 
 {
   return (minmax[0] <= coords && minmax[1] >= coords);
 }
 
-inline VertexDataRef::VertexDataRef(const HomCoord &this_min, const HomCoord &this_max,
+inline SweptElementData::VertexDataRef::VertexDataRef(const HomCoord &this_min, const HomCoord &this_max,
                                     const HomXform &tmp_xform, SweptVertexData *this_seq)
     : xform(tmp_xform), invXform(tmp_xform.inverse()), srcSeq(this_seq)
 {