Merge remote branch 'origin/V7_dev'

This commit is contained in:
vsr 2016-04-04 12:41:03 +03:00
commit 3799901cfc
2 changed files with 2 additions and 2 deletions

View File

@ -499,7 +499,7 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations
* \param theStats the operation statistics. Output parameter. * \param theStats the operation statistics. Output parameter.
* \return the shape without extracted sub-shapes. * \return the shape without extracted sub-shapes.
*/ */
Handle(GEOM_Object) MakeExtraction Standard_EXPORT Handle(GEOM_Object) MakeExtraction
(const Handle(GEOM_Object) &theShape, (const Handle(GEOM_Object) &theShape,
const Handle(TColStd_HArray1OfInteger) &theSubShapeIDs, const Handle(TColStd_HArray1OfInteger) &theSubShapeIDs,
std::list<ExtractionStat> &theStats); std::list<ExtractionStat> &theStats);

View File

@ -2320,7 +2320,7 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeExtraction
aResStat->indices = aResIDList; aResStat->indices = aResIDList;
theStats[i] = aResStat; theStats[(_CORBA_ULong)i] = aResStat;
} }
return GetObject(aResult); return GetObject(aResult);