Merge from branch BR_Dev_For_4_0 (from tag mergeto_BR_QT4_Dev_12Feb08)

[modules/geom.git] / src / GEOMImpl / GEOMImpl_GlueDriver.hxx

diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
index eee00b868d75f9e096b733a9b066e7bae9d624cd..e7c3befa849c93a28e0484cf4cec58044f01a348 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
+++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx
@@ -150,14 +150,17 @@ Standard_EXPORT static const Standard_GUID& GetID();
 Standard_EXPORT ~GEOMImpl_GlueDriver() {};
 
 Standard_EXPORT static TopoDS_Shape GlueFaces (const TopoDS_Shape& theShape,
-                                               const Standard_Real theTolerance);
+                                               const Standard_Real theTolerance,
+                                               const Standard_Boolean doKeepNonSolids = Standard_True);
 
 Standard_EXPORT TopoDS_Shape GlueFacesWithWarnings (const TopoDS_Shape& theShape,
                                                     const Standard_Real theTolerance,
+                                                    const Standard_Boolean doKeepNonSolids,
                                                     TCollection_AsciiString& theWarning) const;
 
 Standard_EXPORT static TopoDS_Shape GlueFacesByList (const TopoDS_Shape& theShape,
                                                     const Standard_Real theTolerance,
+                                                     const Standard_Boolean doKeepNonSolids,
                                                     const TopTools_MapOfShape& aFaces);