Merge from V7_2_BR 09/08/2013

This commit is contained in:
vsr 2013-08-12 10:50:36 +00:00
parent 8c589f8585
commit 4d6cb35b78
2 changed files with 3 additions and 2 deletions

View File

@ -54,7 +54,8 @@ libSMESHControls_la_LDFLAGS = \
../SMESHDS/libSMESHDS.la \ ../SMESHDS/libSMESHDS.la \
../SMESHUtils/libSMESHUtils.la \ ../SMESHUtils/libSMESHUtils.la \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \
$(VTK_LIBS) $(VTK_LIBS) \
$(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics
SMESHControls_CPPFLAGS = \ SMESHControls_CPPFLAGS = \
$(libSMESHControls_la_CPPFLAGS) $(libSMESHControls_la_CPPFLAGS)

View File

@ -165,7 +165,7 @@ public:
cellList.push_back(vtkId); cellList.push_back(vtkId);
} }
} }
myCells = &cellList[0]; myCells = cellList.empty() ? 0 : &cellList[0];
myNcells = cellList.size(); myNcells = cellList.size();
//MESSAGE("myNcells="<<myNcells); //MESSAGE("myNcells="<<myNcells);
} }