Merge branch 'csgroup_IS2'

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_ShapeTools.h

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
index 4fa50be493088e9bf4895c2833b49da3a389919c..b1f154948890d96c8de783aec26bd0c4a4ff70ee 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
@@ -24,9 +24,11 @@
 
 #include <GeomAPI_Shape.h>
 #include <GeomAPI_Vertex.h>
-
 #include <map>
 #include <set>
+#ifdef WIN32
+ #include<array>
+#endif WIN32
 
 class GeomAPI_Ax1;
 class GeomAPI_Edge;
@@ -68,6 +70,9 @@ public:
   /// \brief Calculate minimal distance between shapes
   GEOMALGOAPI_EXPORT static double minimalDistance(const GeomShapePtr& theShape1,
                                                    const GeomShapePtr& theShape2);
+  GEOMALGOAPI_EXPORT static double minimalDistance(const GeomShapePtr& theShape1,
+                                                   const GeomShapePtr& theShape2,
+                                                   std::array<double, 3> & fromShape1To2);
 
   /// \brief Combines faces with common edges to shells, or solids to compsolids.
   /// \param[in] theCompound compound of shapes.