Add persistance dimensions : fix compilation errors on linux.

diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx
index 087e3e810cac521cef8e0ab0846d61d645b7bb7a..9b3379f9177c05a43ad5cce6af708a8cb1c5a3b4 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx
+++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx
@@ -76,6 +76,20 @@
 #include <TColgp_SequenceOfDir.hxx>
 #include <V3d_View.hxx>
 
+
+// plane associated with custom data
+struct PlaneAndSegment
+{
+  PlaneAndSegment() {}
+  PlaneAndSegment(const gp_Pln& thePlane, const MeasureGUI_DimensionCreateTool::Segment& theSegment) : pln(thePlane), seg(theSegment) {}
+  operator gp_Pln () const { return pln; }
+  operator MeasureGUI_DimensionCreateTool::Segment () const { return seg; }
+  gp_Pln pln;
+  MeasureGUI_DimensionCreateTool::Segment seg;
+};
+
+typedef NCollection_Sequence<PlaneAndSegment> SeqOfPlnsAndSegments;
+
 //=================================================================================
 // function : Constructor
 // purpose  :
@@ -915,18 +929,6 @@ void MeasureGUI_DimensionCreateTool::PositionDiameter( const Bnd_Box& theBnd,
                                                        gp_Pnt& thePnt2,
                                                        gp_Pln& thePln ) const
 {
-  // plane associated with custom data
-  struct PlaneAndSegment
-  {
-    PlaneAndSegment() {}
-    PlaneAndSegment(const gp_Pln& thePlane, const Segment& theSegment) : pln(thePlane), seg(theSegment) {}
-    operator gp_Pln () const { return pln; }
-    operator Segment () const { return seg; }
-    gp_Pln pln;
-    Segment seg;
-  };
-  typedef NCollection_Sequence<PlaneAndSegment> SeqOfPlnsAndSegments;
-
   // select list of measured segments aligned to projection planes
   SeqOfDirs aProjectionDirs;
   aProjectionDirs.Append( gp::DX() );

diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h
index 8a396786cac756c85ca872b80d9b7bed611ee7fb..c470e53e12ab45ffd9e3dd24140f420f92817f90 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h
+++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h
@@ -47,6 +47,7 @@
 //=================================================================================
 class MeasureGUI_DimensionCreateTool
 {
+ public:
   struct Segment
   {
     gp_Pnt First;
@@ -56,7 +57,6 @@ class MeasureGUI_DimensionCreateTool
   typedef NCollection_Sequence<gp_Pln>  SeqOfPlanes;
   typedef NCollection_Sequence<Segment> SeqOfSegments;
 
-public:
   MeasureGUI_DimensionCreateTool();
 
   struct