#18963 C++17 ready

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp
index 558e3fd901ff180a0dae8260c73f6cea40b604f4..8a70c92b85c3651129772bf9e945a1d07ab6e689 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp
@@ -26,12 +26,12 @@ GeomAlgoAPI_Exception::GeomAlgoAPI_Exception(std::string theMessageError)
 }
 
 //=================================================================================================
 }
 
 //=================================================================================================

-GeomAlgoAPI_Exception::~GeomAlgoAPI_Exception() throw()
+GeomAlgoAPI_Exception::~GeomAlgoAPI_Exception() noexcept

 {
 }
 
 //=================================================================================================
 {
 }
 
 //=================================================================================================

-const char* GeomAlgoAPI_Exception::what() const throw()
+const char* GeomAlgoAPI_Exception::what() const noexcept

 {
   return myMessageError.c_str();
 {
   return myMessageError.c_str();

-}
\ No newline at end of file
+}

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Exception.h b/src/GeomAlgoAPI/GeomAlgoAPI_Exception.h
index 669d30962656229280ee96a63a9b596114ea37a7..023ced1a7e6fd7abedc4fb66472309559d6b9b38 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Exception.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Exception.h
@@ -35,13 +35,13 @@ class GeomAlgoAPI_Exception : public std::exception
   /// \param theMessageError Error message to be displayed
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Exception(std::string theMessageError);
   /// Destroyer
   /// \param theMessageError Error message to be displayed
   GEOMALGOAPI_EXPORT GeomAlgoAPI_Exception(std::string theMessageError);
   /// Destroyer

-  GEOMALGOAPI_EXPORT ~GeomAlgoAPI_Exception() throw();
+  GEOMALGOAPI_EXPORT ~GeomAlgoAPI_Exception() noexcept;

   /// Allows to collet the error
   /// Allows to collet the error

-  GEOMALGOAPI_EXPORT const char* what() const throw();
+  GEOMALGOAPI_EXPORT const char* what() const noexcept;

 
 private:
   std::string myMessageError; /// Error message to be displayed.
 };
 
 
 
 private:
   std::string myMessageError; /// Error message to be displayed.
 };
 
 

-#endif
\ No newline at end of file
+#endif

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
index d6b736d3a2d05ae643053ea67595809c81fee147..fcb59553140def598f3fa0b1d5cb9564a2d4d748 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp
@@ -36,7 +36,7 @@
 
 #include <math.h>
 
 
 #include <math.h>
 

-static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo)  throw (GeomAlgoAPI_Exception)
+static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo)

 {
   if (!theAlgo.check())
     throw GeomAlgoAPI_Exception(theAlgo.getError());
 {
   if (!theAlgo.check())
     throw GeomAlgoAPI_Exception(theAlgo.getError());


@@ -50,7 +50,6 @@ static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo)  throw (GeomAlgoAPI_
 }
 
 static GeomShapePtr runAlgoAndCheckShape(GeomAlgoAPI_MakeShape& theAlgo, const std::string& theMsg)
 }
 
 static GeomShapePtr runAlgoAndCheckShape(GeomAlgoAPI_MakeShape& theAlgo, const std::string& theMsg)

-throw (GeomAlgoAPI_Exception)

 {
   if (!theAlgo.check())
     throw GeomAlgoAPI_Exception(theAlgo.getError());
 {
   if (!theAlgo.check())
     throw GeomAlgoAPI_Exception(theAlgo.getError());


@@ -68,7 +67,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(
     const double theDx, const double theDy,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(
     const double theDx, const double theDy,

-    const double theDz) throw (GeomAlgoAPI_Exception)
+    const double theDz)

   {
     static const std::string aMsg("Box builder with dimensions");
     GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz);
   {
     static const std::string aMsg("Box builder with dimensions");
     GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz);


@@ -78,7 +77,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(
     std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeBox(
     std::shared_ptr<GeomAPI_Pnt> theFirstPoint,

-    std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Pnt> theSecondPoint)

   {
     static const std::string aMsg("Box builder with two points");
     GeomAlgoAPI_Box aBoxAlgo(theFirstPoint, theSecondPoint);
   {
     static const std::string aMsg("Box builder with two points");
     GeomAlgoAPI_Box aBoxAlgo(theFirstPoint, theSecondPoint);


@@ -88,7 +87,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
     std::shared_ptr<GeomAPI_Pnt> theBasePoint, std::shared_ptr<GeomAPI_Edge> theEdge,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
     std::shared_ptr<GeomAPI_Pnt> theBasePoint, std::shared_ptr<GeomAPI_Edge> theEdge,

-    double theRadius, double theHeight) throw (GeomAlgoAPI_Exception)
+    double theRadius, double theHeight)

   {
     // Check if the base point is OK
     if (!theBasePoint) {
   {
     // Check if the base point is OK
     if (!theBasePoint) {


@@ -112,7 +111,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
     std::shared_ptr<GeomAPI_Pnt> theBasePoint, std::shared_ptr<GeomAPI_Edge> theEdge,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
     std::shared_ptr<GeomAPI_Pnt> theBasePoint, std::shared_ptr<GeomAPI_Edge> theEdge,

-    double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception)
+    double theRadius, double theHeight, double theAngle)

   {
     // Check if the base point is OK
     if (!theBasePoint) {
   {
     // Check if the base point is OK
     if (!theBasePoint) {


@@ -135,7 +134,7 @@ namespace GeomAlgoAPI_ShapeAPI
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(

-    double theRadius, double theHeight) throw (GeomAlgoAPI_Exception)
+    double theRadius, double theHeight)

   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));
   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));


@@ -152,7 +151,7 @@ namespace GeomAlgoAPI_ShapeAPI
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCylinder(

-    double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception)
+    double theRadius, double theHeight, double theAngle)

   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));
   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));


@@ -169,7 +168,7 @@ namespace GeomAlgoAPI_ShapeAPI
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSphere(
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSphere(

-      std::shared_ptr<GeomAPI_Pnt> theCenterPoint, double theRadius) throw (GeomAlgoAPI_Exception)
+      std::shared_ptr<GeomAPI_Pnt> theCenterPoint, double theRadius)

   {
     static const std::string aMsg("Sphere builder");
     GeomAlgoAPI_Sphere aSphereAlgo(theCenterPoint, theRadius);
   {
     static const std::string aMsg("Sphere builder");
     GeomAlgoAPI_Sphere aSphereAlgo(theCenterPoint, theRadius);


@@ -178,7 +177,6 @@ namespace GeomAlgoAPI_ShapeAPI
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSphere(double theRadius)
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSphere(double theRadius)

-      throw (GeomAlgoAPI_Exception)

   {
     std::shared_ptr<GeomAPI_Pnt> aCenterPoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));
   {
     std::shared_ptr<GeomAPI_Pnt> aCenterPoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));


@@ -193,7 +191,6 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTorus(
       std::shared_ptr<GeomAPI_Pnt> theBasePoint,
       std::shared_ptr<GeomAPI_Edge> theEdge,double theRadius, double theRingRadius)
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTorus(
       std::shared_ptr<GeomAPI_Pnt> theBasePoint,
       std::shared_ptr<GeomAPI_Edge> theEdge,double theRadius, double theRingRadius)

-      throw (GeomAlgoAPI_Exception)

   {
     // Check if the base point is OK
     if (!theBasePoint) {
   {
     // Check if the base point is OK
     if (!theBasePoint) {


@@ -216,7 +213,7 @@ namespace GeomAlgoAPI_ShapeAPI
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTorus(double theRadius,
 
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTorus(double theRadius,

-      double theRingRadius) throw (GeomAlgoAPI_Exception)
+      double theRingRadius)

   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));
   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));


@@ -236,7 +233,7 @@ namespace GeomAlgoAPI_ShapeAPI
       std::shared_ptr<GeomAPI_Pnt> theBasePoint,
       std::shared_ptr<GeomAPI_Edge> theEdge,
       double theBaseRadius, double theTopRadius,
       std::shared_ptr<GeomAPI_Pnt> theBasePoint,
       std::shared_ptr<GeomAPI_Edge> theEdge,
       double theBaseRadius, double theTopRadius,

-      double theHeight) throw (GeomAlgoAPI_Exception)
+      double theHeight)

   {
     // Check if the base point is OK
     if (!theBasePoint) {
   {
     // Check if the base point is OK
     if (!theBasePoint) {


@@ -260,7 +257,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCone(
       double theBaseRadius, double theTopRadius,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeCone(
       double theBaseRadius, double theTopRadius,

-      double theHeight) throw (GeomAlgoAPI_Exception)
+      double theHeight)

   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));
   {
     std::shared_ptr<GeomAPI_Pnt> aBasePoint =
       std::shared_ptr<GeomAPI_Pnt>(new GeomAPI_Pnt(0.,0.,0.));


@@ -279,7 +276,7 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTranslation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1>   theAxis,
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTranslation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1>   theAxis,

-    const double theDistance) throw (GeomAlgoAPI_Exception)
+    const double theDistance)

   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theAxis, theDistance);
     return runAlgo(aTranslationAlgo);
   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theAxis, theDistance);
     return runAlgo(aTranslationAlgo);


@@ -290,7 +287,7 @@ namespace GeomAlgoAPI_ShapeAPI
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     const double theDx,
     const double theDy,
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     const double theDx,
     const double theDy,

-    const double theDz) throw (GeomAlgoAPI_Exception)
+    const double theDz)

   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theDx, theDy, theDz);
     return runAlgo(aTranslationAlgo);
   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theDx, theDy, theDz);
     return runAlgo(aTranslationAlgo);


@@ -300,7 +297,7 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTranslation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt>   theStartPoint,
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeTranslation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt>   theStartPoint,

-    std::shared_ptr<GeomAPI_Pnt>   theEndPoint) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Pnt>   theEndPoint)

   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theStartPoint, theEndPoint);
     return runAlgo(aTranslationAlgo);
   {
     GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theStartPoint, theEndPoint);
     return runAlgo(aTranslationAlgo);


@@ -310,7 +307,7 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeRotation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeRotation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,

-    const double theAngle) throw (GeomAlgoAPI_Exception)
+    const double theAngle)

   {
     GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theAxis, theAngle);
     return runAlgo(aRotationAlgo);
   {
     GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theAxis, theAngle);
     return runAlgo(aRotationAlgo);


@@ -321,7 +318,7 @@ namespace GeomAlgoAPI_ShapeAPI
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
     std::shared_ptr<GeomAPI_Pnt> theStartPoint,
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
     std::shared_ptr<GeomAPI_Pnt> theStartPoint,

-    std::shared_ptr<GeomAPI_Pnt> theEndPoint) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Pnt> theEndPoint)

   {
     GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theCenterPoint, theStartPoint, theEndPoint);
     return runAlgo(aRotationAlgo);
   {
     GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theCenterPoint, theStartPoint, theEndPoint);
     return runAlgo(aRotationAlgo);


@@ -330,7 +327,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,

-    std::shared_ptr<GeomAPI_Pnt>   thePoint) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Pnt>   thePoint)

   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePoint);
     return runAlgo(aSymmetryAlgo);
   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePoint);
     return runAlgo(aSymmetryAlgo);


@@ -339,7 +336,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,

-    std::shared_ptr<GeomAPI_Ax1>   theAxis) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Ax1>   theAxis)

   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, theAxis);
     return runAlgo(aSymmetryAlgo);
   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, theAxis);
     return runAlgo(aSymmetryAlgo);


@@ -348,7 +345,7 @@ namespace GeomAlgoAPI_ShapeAPI
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
   //===============================================================================================
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeSymmetry(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,

-    std::shared_ptr<GeomAPI_Ax2>   thePlane) throw (GeomAlgoAPI_Exception)
+    std::shared_ptr<GeomAPI_Ax2>   thePlane)

   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePlane);
     return runAlgo(aSymmetryAlgo);
   {
     GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePlane);
     return runAlgo(aSymmetryAlgo);


@@ -358,7 +355,7 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeScale(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt>   theCenterPoint,
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeScale(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Pnt>   theCenterPoint,

-    const double                   theScaleFactor) throw (GeomAlgoAPI_Exception)
+    const double                   theScaleFactor)

   {
     GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactor);
     return runAlgo(aScaleAlgo);
   {
     GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactor);
     return runAlgo(aScaleAlgo);


@@ -370,7 +367,7 @@ namespace GeomAlgoAPI_ShapeAPI
     std::shared_ptr<GeomAPI_Pnt>   theCenterPoint,
     const double                   theScaleFactorX,
     const double                   theScaleFactorY,
     std::shared_ptr<GeomAPI_Pnt>   theCenterPoint,
     const double                   theScaleFactorX,
     const double                   theScaleFactorY,

-    const double                   theScaleFactorZ) throw (GeomAlgoAPI_Exception)
+    const double                   theScaleFactorZ)

   {
     GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint,
                                  theScaleFactorX, theScaleFactorY, theScaleFactorZ);
   {
     GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint,
                                  theScaleFactorX, theScaleFactorY, theScaleFactorZ);


@@ -382,7 +379,7 @@ namespace GeomAlgoAPI_ShapeAPI
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
     const double theStep,
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
     const double theStep,

-    const int theNumber) throw (GeomAlgoAPI_Exception)
+    const int theNumber)

   {
     if (!theAxis) {
       std::string aError = "Multitranslation builder ";
   {
     if (!theAxis) {
       std::string aError = "Multitranslation builder ";


@@ -412,7 +409,7 @@ namespace GeomAlgoAPI_ShapeAPI
     const int theFirstNumber,
     std::shared_ptr<GeomAPI_Ax1> theSecondAxis,
     const double theSecondStep,
     const int theFirstNumber,
     std::shared_ptr<GeomAPI_Ax1> theSecondAxis,
     const double theSecondStep,

-    const int theSecondNumber) throw (GeomAlgoAPI_Exception)
+    const int theSecondNumber)

   {
     if (!theFirstAxis) {
       std::string aError = "Multitranslation builder ";
   {
     if (!theFirstAxis) {
       std::string aError = "Multitranslation builder ";


@@ -466,7 +463,7 @@ namespace GeomAlgoAPI_ShapeAPI
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeMultiRotation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
   std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_ShapeAPI::makeMultiRotation(
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,

-    const int theNumber) throw (GeomAlgoAPI_Exception)
+    const int theNumber)

   {
     if (!theAxis) {
       std::string aError = "Multirotation builder ";
   {
     if (!theAxis) {
       std::string aError = "Multirotation builder ";


@@ -495,7 +492,7 @@ namespace GeomAlgoAPI_ShapeAPI
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
     const double theStep,
     std::shared_ptr<GeomAPI_Shape> theSourceShape,
     std::shared_ptr<GeomAPI_Ax1> theAxis,
     const double theStep,

-    const int theNumber) throw (GeomAlgoAPI_Exception)
+    const int theNumber)

   {
     if (!theAxis) {
       std::string aError = "Multirotation builder ";
   {
     if (!theAxis) {
       std::string aError = "Multirotation builder ";


@@ -522,7 +519,7 @@ namespace GeomAlgoAPI_ShapeAPI
     const double theRMin1, const double theRMax1,
     const double theRMin2, const double theRMax2,
     const double theZ,
     const double theRMin1, const double theRMax1,
     const double theRMin2, const double theRMax2,
     const double theZ,

-    const double theStartPhi, const double theDeltaPhi) throw (GeomAlgoAPI_Exception)
+    const double theStartPhi, const double theDeltaPhi)

   {
     GeomAlgoAPI_ConeSegment aConeSegmentAlgo(theRMin1, theRMax1, theRMin2, theRMax2,
                                              theZ, theStartPhi, theDeltaPhi);
   {
     GeomAlgoAPI_ConeSegment aConeSegmentAlgo(theRMin1, theRMax1, theRMin2, theRMax2,
                                              theZ, theStartPhi, theDeltaPhi);

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
index 145abb5d6fa8dce212113d117abbeafcb7eb2a53..c7aac3ab40512ae6e58fed861bc3b19f8837ec0d 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.h
@@ -47,14 +47,14 @@ public:
   /// \param theDz The dimension on Z
   /// \return a shape
   static std::shared_ptr<GeomAPI_Shape> makeBox(const double theDx, const double theDy,
   /// \param theDz The dimension on Z
   /// \return a shape
   static std::shared_ptr<GeomAPI_Shape> makeBox(const double theDx, const double theDy,

-                                                const double theDz) throw (GeomAlgoAPI_Exception);
+                                                const double theDz);

 
   /// Creates a box using the two points that defined a diagonal.
   /// \param theFirstPoint One extermity of the diagonal
   /// \param theSecondPoint The other extremity of the diagonal
   /// \return a shape
   static std::shared_ptr<GeomAPI_Shape> makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,
 
   /// Creates a box using the two points that defined a diagonal.
   /// \param theFirstPoint One extermity of the diagonal
   /// \param theSecondPoint The other extremity of the diagonal
   /// \return a shape
   static std::shared_ptr<GeomAPI_Shape> makeBox(std::shared_ptr<GeomAPI_Pnt> theFirstPoint,

-                     std::shared_ptr<GeomAPI_Pnt> theSecondPoint) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Pnt> theSecondPoint);

 
   /// Creates a cylinder using a center, an axis, a radius and a height.
   /// \param theBasePoint The center of the lower base of the cylinder
 
   /// Creates a cylinder using a center, an axis, a radius and a height.
   /// \param theBasePoint The center of the lower base of the cylinder


@@ -62,8 +62,7 @@ public:
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(std::shared_ptr<GeomAPI_Pnt> theBasePoint,

-                     std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theHeight)
-                     throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theHeight);

 
   /// Creates a portion of cylinder using a center, an axis, a radius, a height and an angle.
   /// \param theBasePoint The center of the lower base of the cylinder
 
   /// Creates a portion of cylinder using a center, an axis, a radius, a height and an angle.
   /// \param theBasePoint The center of the lower base of the cylinder


@@ -73,31 +72,29 @@ public:
   /// \param theAngle The angle defining the portion
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
                      std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theHeight,
   /// \param theAngle The angle defining the portion
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
                      std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theHeight,

-                     double theAngle) throw (GeomAlgoAPI_Exception);
+                     double theAngle);

 
   /// Creates a cylinder using the origin, the OZ axis, a radius and a height.
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder
 
   /// Creates a cylinder using the origin, the OZ axis, a radius and a height.
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder

-  static std::shared_ptr<GeomAPI_Shape> makeCylinder(double theRadius, double theHeight)
-                     throw (GeomAlgoAPI_Exception);
+  static std::shared_ptr<GeomAPI_Shape> makeCylinder(double theRadius, double theHeight);

 
   /// Creates a portion of cylinder using the origin, the OZ axis, a radius, a height and an angle.
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder
   /// \param theAngle The angle defining the portion
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(double theRadius, double theHeight,
 
   /// Creates a portion of cylinder using the origin, the OZ axis, a radius, a height and an angle.
   /// \param theRadius The radius of the cylinder
   /// \param theHeight The heigth of the cylinder
   /// \param theAngle The angle defining the portion
   static std::shared_ptr<GeomAPI_Shape> makeCylinder(double theRadius, double theHeight,

-                     double theAngle) throw (GeomAlgoAPI_Exception);
+                     double theAngle);

 
   /// Creates a sphere using a center and a radius.
   /// \param theCenterPoint The center of the sphere
   /// \param theRadius The radius of the sphere
   static std::shared_ptr<GeomAPI_Shape> makeSphere(std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
 
   /// Creates a sphere using a center and a radius.
   /// \param theCenterPoint The center of the sphere
   /// \param theRadius The radius of the sphere
   static std::shared_ptr<GeomAPI_Shape> makeSphere(std::shared_ptr<GeomAPI_Pnt> theCenterPoint,

-                     double theRadius) throw (GeomAlgoAPI_Exception);
+                     double theRadius);

 
   /// Creates a sphere using the origin and a radius.
   /// \param theRadius The radius of the sphere
 
   /// Creates a sphere using the origin and a radius.
   /// \param theRadius The radius of the sphere

-  static std::shared_ptr<GeomAPI_Shape> makeSphere(double theRadius)
-                     throw (GeomAlgoAPI_Exception);
+  static std::shared_ptr<GeomAPI_Shape> makeSphere(double theRadius);

 
   /// Creates a torus using a base point, an axis, a radius and a ring radius.
   /// \param theBasePoint The center of the torus
 
   /// Creates a torus using a base point, an axis, a radius and a ring radius.
   /// \param theBasePoint The center of the torus


@@ -105,14 +102,12 @@ public:
   /// \param theRadius The radius of the torus
   /// \param theRingRadius The ring radius of the torus
   static std::shared_ptr<GeomAPI_Shape> makeTorus(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
   /// \param theRadius The radius of the torus
   /// \param theRingRadius The ring radius of the torus
   static std::shared_ptr<GeomAPI_Shape> makeTorus(std::shared_ptr<GeomAPI_Pnt> theBasePoint,

-                     std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theRingRadius)
-                     throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Edge> theEdge, double theRadius, double theRingRadius);

 
   /// Creates a torus using a radius and a ring radius.
   /// \param theRadius The radius of the torus
   /// \param theRingRadius The ring radius of the torus
 
   /// Creates a torus using a radius and a ring radius.
   /// \param theRadius The radius of the torus
   /// \param theRingRadius The ring radius of the torus

-  static std::shared_ptr<GeomAPI_Shape> makeTorus(double theRadius, double theRingRadius)
-                     throw (GeomAlgoAPI_Exception);
+  static std::shared_ptr<GeomAPI_Shape> makeTorus(double theRadius, double theRingRadius);

 
   /// Creates a cone using a base point, an axis, a base radius, a top radius and a height.
   /// \param theBasePoint The center of the lower base of the cone
 
   /// Creates a cone using a base point, an axis, a base radius, a top radius and a height.
   /// \param theBasePoint The center of the lower base of the cone


@@ -122,14 +117,14 @@ public:
   /// \param theHeight The height of the cone
   static std::shared_ptr<GeomAPI_Shape> makeCone(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
                      std::shared_ptr<GeomAPI_Edge> theEdge, double theBaseRadius,
   /// \param theHeight The height of the cone
   static std::shared_ptr<GeomAPI_Shape> makeCone(std::shared_ptr<GeomAPI_Pnt> theBasePoint,
                      std::shared_ptr<GeomAPI_Edge> theEdge, double theBaseRadius,

-                     double theTopRadius, double theHeight) throw (GeomAlgoAPI_Exception);
+                     double theTopRadius, double theHeight);

 
   /// Creates a cone using a base radius, a top radius and a height.
   /// \param theBaseRadius The base radius of the cone
   /// \param theTopRadius The top radius of the cone
   /// \param theHeight The height of the cone
   static std::shared_ptr<GeomAPI_Shape> makeCone(double theBaseRadius, double theTopRadius,
 
   /// Creates a cone using a base radius, a top radius and a height.
   /// \param theBaseRadius The base radius of the cone
   /// \param theTopRadius The top radius of the cone
   /// \param theHeight The height of the cone
   static std::shared_ptr<GeomAPI_Shape> makeCone(double theBaseRadius, double theTopRadius,

-                     double theHeight) throw (GeomAlgoAPI_Exception);
+                     double theHeight);

 
   /// Performs a translation from an axis and a distance.
   /// \param theSourceShape Shape to be moved
 
   /// Performs a translation from an axis and a distance.
   /// \param theSourceShape Shape to be moved


@@ -139,7 +134,7 @@ public:
   static std::shared_ptr<GeomAPI_Shape> makeTranslation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
   static std::shared_ptr<GeomAPI_Shape> makeTranslation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,

-                     const double theDistance) throw (GeomAlgoAPI_Exception);
+                     const double theDistance);

 
   /// Performs a translation from dimensions.
   /// \param theSourceShape Shape to be moved
 
   /// Performs a translation from dimensions.
   /// \param theSourceShape Shape to be moved


@@ -151,7 +146,7 @@ public:
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      const double theDx,
                      const double theDy,
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      const double theDx,
                      const double theDy,

-                     const double theDz) throw (GeomAlgoAPI_Exception);
+                     const double theDz);

 
   /// Performs a translation from two points.
   /// \param theSourceShape Shape to be moved
 
   /// Performs a translation from two points.
   /// \param theSourceShape Shape to be moved


@@ -161,7 +156,7 @@ public:
   static std::shared_ptr<GeomAPI_Shape> makeTranslation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theStartPoint,
   static std::shared_ptr<GeomAPI_Shape> makeTranslation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theStartPoint,

-                     std::shared_ptr<GeomAPI_Pnt> theEndPoint) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Pnt> theEndPoint);

 
   /// Performs a rotation from an axis and an angle.
   /// \param theSourceShape Shape to be rotated
 
   /// Performs a rotation from an axis and an angle.
   /// \param theSourceShape Shape to be rotated


@@ -171,7 +166,7 @@ public:
   static std::shared_ptr<GeomAPI_Shape> makeRotation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
   static std::shared_ptr<GeomAPI_Shape> makeRotation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,

-                     const double theAngle) throw (GeomAlgoAPI_Exception);
+                     const double theAngle);

 
   /// Performs a rotation from three points.
   /// \param theSourceShape Shape to be rotated
 
   /// Performs a rotation from three points.
   /// \param theSourceShape Shape to be rotated


@@ -183,28 +178,28 @@ public:
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
                      std::shared_ptr<GeomAPI_Pnt> theStartPoint,
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
                      std::shared_ptr<GeomAPI_Pnt> theStartPoint,

-                     std::shared_ptr<GeomAPI_Pnt> theEndPoint) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Pnt> theEndPoint);

 
   /// Performs a symmetry by a point.
   /// \param theSourceShape Shape be symmetrized
   /// \param thePoint Point of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
 
   /// Performs a symmetry by a point.
   /// \param theSourceShape Shape be symmetrized
   /// \param thePoint Point of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,

-                     std::shared_ptr<GeomAPI_Pnt> thePoint) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Pnt> thePoint);

 
   /// Performs a symmetry by an axis.
   /// \param theSourceShape Shape be symmetrized
   /// \param theAxis Axis of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
 
   /// Performs a symmetry by an axis.
   /// \param theSourceShape Shape be symmetrized
   /// \param theAxis Axis of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,

-                     std::shared_ptr<GeomAPI_Ax1> theAxis) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Ax1> theAxis);

 
   /// Performs a symmetry by a plane.
   /// \param theSourceShape Shape be symmetrized
   /// \param thePlane Plane of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
 
   /// Performs a symmetry by a plane.
   /// \param theSourceShape Shape be symmetrized
   /// \param thePlane Plane of symmetry
   static std::shared_ptr<GeomAPI_Shape> makeSymmetry(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,

-                     std::shared_ptr<GeomAPI_Ax2> thePlane) throw (GeomAlgoAPI_Exception);
+                     std::shared_ptr<GeomAPI_Ax2> thePlane);

 
   /// Performs a scale by a scale factor.
   /// \param theSourceShape Shape be scaled
 
   /// Performs a scale by a scale factor.
   /// \param theSourceShape Shape be scaled


@@ -213,7 +208,7 @@ public:
   static std::shared_ptr<GeomAPI_Shape> makeScale(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
   static std::shared_ptr<GeomAPI_Shape> makeScale(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,

-                     const double theScaleFactor) throw (GeomAlgoAPI_Exception);
+                     const double theScaleFactor);

 
   /// Performs a scale by dimensions.
   /// \param theSourceShape Shape be scaled
 
   /// Performs a scale by dimensions.
   /// \param theSourceShape Shape be scaled


@@ -226,7 +221,7 @@ public:
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
                      const double theScaleFactorX,
                      const double theScaleFactorY,
                      std::shared_ptr<GeomAPI_Pnt> theCenterPoint,
                      const double theScaleFactorX,
                      const double theScaleFactorY,

-                     const double theScaleFactorZ) throw (GeomAlgoAPI_Exception);
+                     const double theScaleFactorZ);

 
   /// Performs a multi translation along one axis, at a distance and a number of times
   /// \param theSourceShape Shape to be moved
 
   /// Performs a multi translation along one axis, at a distance and a number of times
   /// \param theSourceShape Shape to be moved


@@ -238,7 +233,7 @@ public:
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
                      const double theStep,
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
                      const double theStep,

-                     const int theNumber) throw (GeomAlgoAPI_Exception);
+                     const int theNumber);

 
   /// Performs a multi translation along two axis : a different distance on each axis
   /// and a different number of times for each axis
 
   /// Performs a multi translation along two axis : a different distance on each axis
   /// and a different number of times for each axis


@@ -257,7 +252,7 @@ public:
                      const int theFirstNumber,
                      std::shared_ptr<GeomAPI_Ax1> theSecondAxis,
                      const double theSecondStep,
                      const int theFirstNumber,
                      std::shared_ptr<GeomAPI_Ax1> theSecondAxis,
                      const double theSecondStep,

-                     const int theSecondNumber) throw (GeomAlgoAPI_Exception);
+                     const int theSecondNumber);

 
   /// Performs a multi rotation along one axis and a number of times
   /// \param[in] theSourceShape Shape to be rotated
 
   /// Performs a multi rotation along one axis and a number of times
   /// \param[in] theSourceShape Shape to be rotated


@@ -266,7 +261,7 @@ public:
   static std::shared_ptr<GeomAPI_Shape> makeMultiRotation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
   static std::shared_ptr<GeomAPI_Shape> makeMultiRotation(
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,

-                     const int theNumber) throw (GeomAlgoAPI_Exception);
+                     const int theNumber);

 
   /// Performs a multi rotation along one axis, at a step and a number of times
   /// \param theSourceShape Shape to be moved
 
   /// Performs a multi rotation along one axis, at a step and a number of times
   /// \param theSourceShape Shape to be moved


@@ -277,7 +272,7 @@ public:
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
                      const double theStep,
                      std::shared_ptr<GeomAPI_Shape> theSourceShape,
                      std::shared_ptr<GeomAPI_Ax1> theAxis,
                      const double theStep,

-                     const int theNumber) throw (GeomAlgoAPI_Exception);
+                     const int theNumber);

 
   /// Creates a cone segment using standard GDML parameters.
   /// \param theRMin1 Inner radius at base of cone
 
   /// Creates a cone segment using standard GDML parameters.
   /// \param theRMin1 Inner radius at base of cone


@@ -294,7 +289,7 @@ public:
                      const double theRMax2,
                      const double theZ,
                      const double theStartPhi,
                      const double theRMax2,
                      const double theZ,
                      const double theStartPhi,

-                     const double theDeltaPhi) throw (GeomAlgoAPI_Exception);
+                     const double theDeltaPhi);

 };
 }
 #endif
 };
 }
 #endif