0024274: Eliminate GCC compiler warning (wrong initialize order)
authorski <ski@opencascade.com>
Mon, 21 Oct 2013 08:04:56 +0000 (12:04 +0400)
committerbugmaster <bugmaster@opencascade.com>
Thu, 24 Oct 2013 07:56:50 +0000 (11:56 +0400)
Eliminated GCC compiler warning about wrong initialize order

13 files changed:
src/Adaptor3d/Adaptor3d_TopolTool.cxx
src/Aspect/Aspect_ColorScale.cxx
src/BOPDS/BOPDS_DS.cxx
src/BOPTools/BOPTools_AlgoTools_1.cxx
src/BOPTools/BOPTools_ConnexityBlock.hxx
src/BRepFill/BRepFill_PipeShell.cxx
src/OpenGl/OpenGl_Context.cxx
src/OpenGl/OpenGl_PrinterContext.cxx
src/OpenGl/OpenGl_View.cxx
src/QANewModTopOpe/QANewModTopOpe_Limitation.cxx
src/StepToGeom/StepToGeom_MakeTrimmedCurve2d.cxx
src/V3d/V3d_View.cxx
src/Voxel/Voxel_FastConverter.cxx

index 8f7b823..97812db 100755 (executable)
@@ -55,7 +55,7 @@ static void GetConeApexParam(const gp_Cone& C, Standard_Real& U, Standard_Real&
 }
 
 
-Adaptor3d_TopolTool::Adaptor3d_TopolTool () : nbRestr(0),myNbSamplesU(-1),idRestr(0)
+Adaptor3d_TopolTool::Adaptor3d_TopolTool () : nbRestr(0),idRestr(0),myNbSamplesU(-1)
                                               
 {
 }
index 128f545..75eaaa6 100755 (executable)
@@ -38,19 +38,19 @@ Aspect_ColorScale::Aspect_ColorScale()
 : MMgt_TShared(),
 myMin( 0.0 ),
 myMax( 1.0 ),
-myXPos( 0 ),
-myYPos( 0 ),
-myWidth( 0.2 ),
 myTitle( "" ),
-myHeight( 1 ),
 myFormat( "%.4g" ),
 myInterval( 10 ),
-myAtBorder( Standard_True ),
 myColorType( Aspect_TOCSD_AUTO ),
-myReversed( Standard_False ),
 myLabelType( Aspect_TOCSD_AUTO ),
+myAtBorder( Standard_True ),
+myReversed( Standard_False ),
 myLabelPos( Aspect_TOCSP_RIGHT ),
 myTitlePos( Aspect_TOCSP_CENTER ),
+myXPos( 0 ),
+myYPos( 0 ),
+myWidth( 0.2 ),
+myHeight( 1 ),
 myTextHeight(20)
 {
 }
index ab9c00b..61d46f0 100644 (file)
@@ -81,8 +81,8 @@ BOPDS_DS::BOPDS_DS()
   myLines(myAllocator),
   myMapShapeIndex(100, myAllocator),
   myPaveBlocksPool(myAllocator),
-  myFaceInfoPool(myAllocator),
   myMapPBCB(100, myAllocator),
+  myFaceInfoPool(myAllocator),
   myShapesSD(100, myAllocator),
   myInterfTB(100, myAllocator),
   myInterfVV(myAllocator),
@@ -107,8 +107,8 @@ BOPDS_DS::BOPDS_DS(const Handle(NCollection_BaseAllocator)& theAllocator)
   myLines(myAllocator),
   myMapShapeIndex(100, myAllocator),
   myPaveBlocksPool(myAllocator),
-  myFaceInfoPool(myAllocator),
   myMapPBCB(100, myAllocator),
+  myFaceInfoPool(myAllocator),
   myShapesSD(100, myAllocator),
   myInterfTB(100, myAllocator),
   myInterfVV(myAllocator),
index ce53efa..ca1b043 100644 (file)
@@ -224,8 +224,8 @@ void CorrectWires(const TopoDS_Face& aFx)
           TopoDS_Vertex aV11, aV12, aV21, aV22;
           TopExp::Vertices(aE, aV11, aV12);
           TopExp::Vertices(aE1, aV21, aV22);
-          if (aV11.IsSame(aV21) && aV12.IsSame(aV22) ||
-              aV12.IsSame(aV21) && aV11.IsSame(aV22)) {
+          if ((aV11.IsSame(aV21) && aV12.IsSame(aV22)) ||
+              (aV12.IsSame(aV21) && aV11.IsSame(aV22))) {
             continue;
           }
         }
index 890c0ef..f31cb84 100644 (file)
@@ -44,8 +44,8 @@ class BOPTools_ConnexityBlock {
   };
   //
   BOPTools_ConnexityBlock(const Handle(NCollection_BaseAllocator)& theAllocator):
-    myRegular(Standard_True),
-    myAllocator(theAllocator),
+       myAllocator(theAllocator),  
+       myRegular(Standard_True),
     myShapes(myAllocator),
     myLoops(myAllocator)  {
   };
index 8107679..e9aef4d 100755 (executable)
@@ -210,8 +210,8 @@ static Standard_Boolean IsSameOriented(const TopoDS_Shape& aFace,
 //=======================================================================
 BRepFill_PipeShell::BRepFill_PipeShell(const TopoDS_Wire& Spine)
                       :  mySpine(Spine), 
-                         myTrihedron(GeomFill_IsCorrectedFrenet),
                          myForceApproxC1(Standard_False),
+                                                myTrihedron(GeomFill_IsCorrectedFrenet),
                          myTransition(BRepFill_Modified),
                          myStatus(GeomFill_PipeOk)
 {
index b7f0d48..6c836fe 100644 (file)
@@ -97,9 +97,9 @@ OpenGl_Context::OpenGl_Context (const Handle(OpenGl_Caps)& theCaps)
   myClippingState (),
   myGlLibHandle (NULL),
   myGlCore20 (NULL),
+  myAnisoMax   (1),
   myMaxTexDim  (1024),
   myMaxClipPlanes (6),
-  myAnisoMax   (1),
   myGlVerMajor (0),
   myGlVerMinor (0),
   myIsFeedback (Standard_False),
index 22ae43e..575d0d3 100644 (file)
@@ -29,10 +29,11 @@ IMPLEMENT_STANDARD_RTTIEXT(OpenGl_PrinterContext, Standard_Transient)
 //=======================================================================
 OpenGl_PrinterContext::OpenGl_PrinterContext()
 : myProjTransform  (0, 3, 0, 3),
-  myLayerViewportX (0),
   myScaleX (1.0f),
-  myLayerViewportY (0),
-  myScaleY (1.0f)
+  myScaleY (1.0f),
+  myLayerViewportX (0),
+  myLayerViewportY (0)
+  
 {
   // identity projection matrix
   Standard_Real anInitValue = 0.0;
index ae4425d..77df670 100644 (file)
@@ -97,13 +97,13 @@ OpenGl_View::OpenGl_View (const CALL_DEF_VIEWCONTEXT &AContext)
   myZClip(myDefaultZClip),
   myExtra(myDefaultExtra),
   myFog(myDefaultFog),
+  myTrihedron(NULL),
+  myGraduatedTrihedron(NULL),
   myVisualization(AContext.Visualization),
   myIntShadingMethod(TEL_SM_GOURAUD),
   myAntiAliasing(Standard_False),
   myTransPers(&myDefaultTransPers),
-  myTrihedron(NULL),
-  myIsTransPers(Standard_False),
-  myGraduatedTrihedron(NULL)
+  myIsTransPers(Standard_False)  
 {
   // Initialize matrices
   memcpy(myOrientationMatrix,myDefaultMatrix,sizeof(Tmatrix3));
index 55ce31c..bc1c35a 100755 (executable)
@@ -55,11 +55,11 @@ QANewModTopOpe_Limitation::QANewModTopOpe_Limitation(const TopoDS_Shape& theObje
                                           const TopoDS_Shape& theCutTool,
                                           const QANewModTopOpe_ModeOfLimitation theMode) : 
        myObjectToCut(theObjectToCut),
+          myCut(NULL),
+          myCommon(NULL),
        myFwdIsDone(Standard_False),
        myRevIsDone(Standard_False),
-       myCut(NULL),
-       myMode(theMode),
-       myCommon(NULL)
+       myMode(theMode)       
 {
 
   TopExp_Explorer anExp;
index 0b90609..639ba33 100755 (executable)
@@ -65,7 +65,7 @@ Standard_Boolean StepToGeom_MakeTrimmedCurve2d::Convert (const Handle(StepGeom_T
   const Handle(StepGeom_HArray1OfTrimmingSelect)& theTrimSel2 = SC->Trim2();
   const Standard_Integer nbSel1 = SC->NbTrim1();
   const Standard_Integer nbSel2 = SC->NbTrim2();
-  if ((nbSel1 == nbSel2 == 1) &&
+  if ((nbSel1 == 1) && (nbSel2 == 1) &&
       (theTrimSel1->Value(1).CaseMember() > 0) &&
       (theTrimSel2->Value(1).CaseMember() > 0))
   {
index 555930e..204b854 100755 (executable)
@@ -271,8 +271,8 @@ MyActiveLights(),
 MyViewContext (),
 myActiveLightsIterator(),
 SwitchSetFront(Standard_False),
-MyTrsf (1, 4, 1, 4),                                    // S3892
-MyProjModel(V3d_TPM_SCREEN)
+MyProjModel(V3d_TPM_SCREEN),
+MyTrsf (1, 4, 1, 4)         // S3892
 {
   myImmediateUpdate = Standard_False;
   MyView = new Visual3d_View(MyViewer->Viewer());
index 47a3764..327d752 100755 (executable)
@@ -50,8 +50,9 @@ Voxel_FastConverter::Voxel_FastConverter(const TopoDS_Shape&    shape,
                                         const Standard_Boolean useExistingTriangulation)
 :myShape(shape),myVoxels(&voxels),
  myDeflection(deflection),
+ myIsBool(2),
  myNbX(nbx),myNbY(nby),myNbZ(nbz),
- myIsBool(2),myNbThreads(nbthreads),
+ myNbThreads(nbthreads),
  myNbTriangles(0),
  myUseExistingTriangulation(useExistingTriangulation)
 {
@@ -68,8 +69,9 @@ Voxel_FastConverter::Voxel_FastConverter(const TopoDS_Shape&    shape,
                                         const Standard_Boolean useExistingTriangulation)
 :myShape(shape),myVoxels(&voxels),
  myDeflection(deflection),
+ myIsBool(1),
  myNbX(nbx),myNbY(nby),myNbZ(nbz),
- myIsBool(1),myNbThreads(nbthreads),
+ myNbThreads(nbthreads),
  myNbTriangles(0),
  myUseExistingTriangulation(useExistingTriangulation)
 {
@@ -86,8 +88,9 @@ Voxel_FastConverter::Voxel_FastConverter(const TopoDS_Shape&    shape,
                                         const Standard_Boolean useExistingTriangulation)
 :myShape(shape),myVoxels(&voxels),
  myDeflection(deflection),
+ myIsBool(0),
  myNbX(nbx),myNbY(nby),myNbZ(nbz),
- myIsBool(0),myNbThreads(nbthreads),
+ myNbThreads(nbthreads),
  myNbTriangles(0),
  myUseExistingTriangulation(useExistingTriangulation)
 {