Salome HOME
One more compilation error on Mageia 5
authorvsr <vsr@opencascade.com>
Fri, 27 Nov 2015 10:13:27 +0000 (13:13 +0300)
committervsr <vsr@opencascade.com>
Fri, 27 Nov 2015 10:13:38 +0000 (13:13 +0300)
src/OBJECT/SMESH_DeviceActor.cxx
src/StdMeshers/StdMeshers_Prism_3D.cxx

index 6f9e3e4..aeba34a 100644 (file)
@@ -363,7 +363,7 @@ SMESH_DeviceActor
                     SMESH_ScalarBarActor* theScalarBarActor,
                     vtkLookupTable* theLookupTable)
 {
-  bool anIsInitialized = theFunctor;
+  bool anIsInitialized = theFunctor != NULL;
   myExtractUnstructuredGrid->ClearRegisteredCells();
   myExtractUnstructuredGrid->ClearRegisteredCellsWithType();
   myExtractUnstructuredGrid->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
index e2330e9..6227072 100644 (file)
@@ -407,8 +407,8 @@ namespace {
       if ( nbQuads > 0 )
         toRemove = helper->IsStructured( faceSm );
       else
-        toRemove = quadAlgo->CheckNbEdges( *helper->GetMesh(),
-                                           faceSm->GetSubShape() );
+        toRemove = quadAlgo->CheckNbEdges( *helper->GetMesh(),
+                                             faceSm->GetSubShape() ) != NULL );
       nbRemoved += toRemove;
       if ( toRemove )
         smIt = notQuadSubMesh.erase( smIt );