From: vsr Date: Fri, 18 Dec 2020 08:37:21 +0000 (+0300) Subject: Revert "#18963 C++17 ready" X-Git-Tag: V9_7_0a1~69 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=72b775fed264bfaf3b68acd0ebfe7d83eafdaa23;p=modules%2Fshaper.git Revert "#18963 C++17 ready" This reverts commit f71c1052b2ecc33488b2136947088777adc17584. --- diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Exception.cpp index 8a70c92b8..558e3fd90 100644 --- 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() noexcept +GeomAlgoAPI_Exception::~GeomAlgoAPI_Exception() throw() { } //================================================================================================= -const char* GeomAlgoAPI_Exception::what() const noexcept +const char* GeomAlgoAPI_Exception::what() const throw() { 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 023ced1a7..669d30962 100644 --- 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 - GEOMALGOAPI_EXPORT ~GeomAlgoAPI_Exception() noexcept; + GEOMALGOAPI_EXPORT ~GeomAlgoAPI_Exception() throw(); /// Allows to collet the error - GEOMALGOAPI_EXPORT const char* what() const noexcept; + GEOMALGOAPI_EXPORT const char* what() const throw(); private: std::string myMessageError; /// Error message to be displayed. }; -#endif +#endif \ No newline at end of file diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp index fcb595531..d6b736d3a 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeAPI.cpp @@ -36,7 +36,7 @@ #include -static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) +static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) throw (GeomAlgoAPI_Exception) { if (!theAlgo.check()) throw GeomAlgoAPI_Exception(theAlgo.getError()); @@ -50,6 +50,7 @@ static GeomShapePtr runAlgo(GeomAlgoAPI_MakeShape& theAlgo) } static GeomShapePtr runAlgoAndCheckShape(GeomAlgoAPI_MakeShape& theAlgo, const std::string& theMsg) +throw (GeomAlgoAPI_Exception) { if (!theAlgo.check()) throw GeomAlgoAPI_Exception(theAlgo.getError()); @@ -67,7 +68,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeBox( const double theDx, const double theDy, - const double theDz) + const double theDz) throw (GeomAlgoAPI_Exception) { static const std::string aMsg("Box builder with dimensions"); GeomAlgoAPI_Box aBoxAlgo(theDx,theDy,theDz); @@ -77,7 +78,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeBox( std::shared_ptr theFirstPoint, - std::shared_ptr theSecondPoint) + std::shared_ptr theSecondPoint) throw (GeomAlgoAPI_Exception) { static const std::string aMsg("Box builder with two points"); GeomAlgoAPI_Box aBoxAlgo(theFirstPoint, theSecondPoint); @@ -87,7 +88,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( std::shared_ptr theBasePoint, std::shared_ptr theEdge, - double theRadius, double theHeight) + double theRadius, double theHeight) throw (GeomAlgoAPI_Exception) { // Check if the base point is OK if (!theBasePoint) { @@ -111,7 +112,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( std::shared_ptr theBasePoint, std::shared_ptr theEdge, - double theRadius, double theHeight, double theAngle) + double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception) { // Check if the base point is OK if (!theBasePoint) { @@ -134,7 +135,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( - double theRadius, double theHeight) + double theRadius, double theHeight) throw (GeomAlgoAPI_Exception) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -151,7 +152,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCylinder( - double theRadius, double theHeight, double theAngle) + double theRadius, double theHeight, double theAngle) throw (GeomAlgoAPI_Exception) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -168,7 +169,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere( - std::shared_ptr theCenterPoint, double theRadius) + std::shared_ptr theCenterPoint, double theRadius) throw (GeomAlgoAPI_Exception) { static const std::string aMsg("Sphere builder"); GeomAlgoAPI_Sphere aSphereAlgo(theCenterPoint, theRadius); @@ -177,6 +178,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSphere(double theRadius) + throw (GeomAlgoAPI_Exception) { std::shared_ptr aCenterPoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -191,6 +193,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTorus( std::shared_ptr theBasePoint, std::shared_ptr theEdge,double theRadius, double theRingRadius) + throw (GeomAlgoAPI_Exception) { // Check if the base point is OK if (!theBasePoint) { @@ -213,7 +216,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTorus(double theRadius, - double theRingRadius) + double theRingRadius) throw (GeomAlgoAPI_Exception) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -233,7 +236,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theBaseRadius, double theTopRadius, - double theHeight) + double theHeight) throw (GeomAlgoAPI_Exception) { // Check if the base point is OK if (!theBasePoint) { @@ -257,7 +260,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeCone( double theBaseRadius, double theTopRadius, - double theHeight) + double theHeight) throw (GeomAlgoAPI_Exception) { std::shared_ptr aBasePoint = std::shared_ptr(new GeomAPI_Pnt(0.,0.,0.)); @@ -276,7 +279,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theDistance) + const double theDistance) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theAxis, theDistance); return runAlgo(aTranslationAlgo); @@ -287,7 +290,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, const double theDx, const double theDy, - const double theDz) + const double theDz) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theDx, theDy, theDz); return runAlgo(aTranslationAlgo); @@ -297,7 +300,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint) + std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Translation aTranslationAlgo(theSourceShape, theStartPoint, theEndPoint); return runAlgo(aTranslationAlgo); @@ -307,7 +310,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theAngle) + const double theAngle) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theAxis, theAngle); return runAlgo(aRotationAlgo); @@ -318,7 +321,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint) + std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Rotation aRotationAlgo(theSourceShape, theCenterPoint, theStartPoint, theEndPoint); return runAlgo(aRotationAlgo); @@ -327,7 +330,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePoint) + std::shared_ptr thePoint) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePoint); return runAlgo(aSymmetryAlgo); @@ -336,7 +339,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr theAxis) + std::shared_ptr theAxis) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, theAxis); return runAlgo(aSymmetryAlgo); @@ -345,7 +348,7 @@ namespace GeomAlgoAPI_ShapeAPI //=============================================================================================== std::shared_ptr GeomAlgoAPI_ShapeAPI::makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePlane) + std::shared_ptr thePlane) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Symmetry aSymmetryAlgo(theSourceShape, thePlane); return runAlgo(aSymmetryAlgo); @@ -355,7 +358,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeScale( std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, - const double theScaleFactor) + const double theScaleFactor) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactor); return runAlgo(aScaleAlgo); @@ -367,7 +370,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theCenterPoint, const double theScaleFactorX, const double theScaleFactorY, - const double theScaleFactorZ) + const double theScaleFactorZ) throw (GeomAlgoAPI_Exception) { GeomAlgoAPI_Scale aScaleAlgo(theSourceShape, theCenterPoint, theScaleFactorX, theScaleFactorY, theScaleFactorZ); @@ -379,7 +382,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber) + const int theNumber) throw (GeomAlgoAPI_Exception) { if (!theAxis) { std::string aError = "Multitranslation builder "; @@ -409,7 +412,7 @@ namespace GeomAlgoAPI_ShapeAPI const int theFirstNumber, std::shared_ptr theSecondAxis, const double theSecondStep, - const int theSecondNumber) + const int theSecondNumber) throw (GeomAlgoAPI_Exception) { if (!theFirstAxis) { std::string aError = "Multitranslation builder "; @@ -463,7 +466,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr GeomAlgoAPI_ShapeAPI::makeMultiRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const int theNumber) + const int theNumber) throw (GeomAlgoAPI_Exception) { if (!theAxis) { std::string aError = "Multirotation builder "; @@ -492,7 +495,7 @@ namespace GeomAlgoAPI_ShapeAPI std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber) + const int theNumber) throw (GeomAlgoAPI_Exception) { if (!theAxis) { std::string aError = "Multirotation builder "; @@ -519,7 +522,7 @@ namespace GeomAlgoAPI_ShapeAPI const double theRMin1, const double theRMax1, const double theRMin2, const double theRMax2, const double theZ, - const double theStartPhi, const double theDeltaPhi) + const double theStartPhi, const double theDeltaPhi) throw (GeomAlgoAPI_Exception) { 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 c7aac3ab4..145abb5d6 100644 --- 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 makeBox(const double theDx, const double theDy, - const double theDz); + const double theDz) throw (GeomAlgoAPI_Exception); /// 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 makeBox(std::shared_ptr theFirstPoint, - std::shared_ptr theSecondPoint); + std::shared_ptr theSecondPoint) throw (GeomAlgoAPI_Exception); /// 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,7 +62,8 @@ public: /// \param theRadius The radius of the cylinder /// \param theHeight The heigth of the cylinder static std::shared_ptr makeCylinder(std::shared_ptr theBasePoint, - std::shared_ptr theEdge, double theRadius, double theHeight); + std::shared_ptr theEdge, double theRadius, double theHeight) + throw (GeomAlgoAPI_Exception); /// 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 @@ -72,29 +73,31 @@ public: /// \param theAngle The angle defining the portion static std::shared_ptr makeCylinder(std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theRadius, double theHeight, - double theAngle); + double theAngle) throw (GeomAlgoAPI_Exception); /// 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 makeCylinder(double theRadius, double theHeight); + static std::shared_ptr makeCylinder(double theRadius, double theHeight) + throw (GeomAlgoAPI_Exception); /// 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 makeCylinder(double theRadius, double theHeight, - double theAngle); + double theAngle) throw (GeomAlgoAPI_Exception); /// 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 makeSphere(std::shared_ptr theCenterPoint, - double theRadius); + double theRadius) throw (GeomAlgoAPI_Exception); /// Creates a sphere using the origin and a radius. /// \param theRadius The radius of the sphere - static std::shared_ptr makeSphere(double theRadius); + static std::shared_ptr makeSphere(double theRadius) + throw (GeomAlgoAPI_Exception); /// Creates a torus using a base point, an axis, a radius and a ring radius. /// \param theBasePoint The center of the torus @@ -102,12 +105,14 @@ public: /// \param theRadius The radius of the torus /// \param theRingRadius The ring radius of the torus static std::shared_ptr makeTorus(std::shared_ptr theBasePoint, - std::shared_ptr theEdge, double theRadius, double theRingRadius); + std::shared_ptr theEdge, double theRadius, double theRingRadius) + throw (GeomAlgoAPI_Exception); /// 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 makeTorus(double theRadius, double theRingRadius); + static std::shared_ptr makeTorus(double theRadius, double theRingRadius) + throw (GeomAlgoAPI_Exception); /// 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 @@ -117,14 +122,14 @@ public: /// \param theHeight The height of the cone static std::shared_ptr makeCone(std::shared_ptr theBasePoint, std::shared_ptr theEdge, double theBaseRadius, - double theTopRadius, double theHeight); + double theTopRadius, double theHeight) throw (GeomAlgoAPI_Exception); /// 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 makeCone(double theBaseRadius, double theTopRadius, - double theHeight); + double theHeight) throw (GeomAlgoAPI_Exception); /// Performs a translation from an axis and a distance. /// \param theSourceShape Shape to be moved @@ -134,7 +139,7 @@ public: static std::shared_ptr makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theDistance); + const double theDistance) throw (GeomAlgoAPI_Exception); /// Performs a translation from dimensions. /// \param theSourceShape Shape to be moved @@ -146,7 +151,7 @@ public: std::shared_ptr theSourceShape, const double theDx, const double theDy, - const double theDz); + const double theDz) throw (GeomAlgoAPI_Exception); /// Performs a translation from two points. /// \param theSourceShape Shape to be moved @@ -156,7 +161,7 @@ public: static std::shared_ptr makeTranslation( std::shared_ptr theSourceShape, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint); + std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception); /// Performs a rotation from an axis and an angle. /// \param theSourceShape Shape to be rotated @@ -166,7 +171,7 @@ public: static std::shared_ptr makeRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const double theAngle); + const double theAngle) throw (GeomAlgoAPI_Exception); /// Performs a rotation from three points. /// \param theSourceShape Shape to be rotated @@ -178,28 +183,28 @@ public: std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, std::shared_ptr theStartPoint, - std::shared_ptr theEndPoint); + std::shared_ptr theEndPoint) throw (GeomAlgoAPI_Exception); /// Performs a symmetry by a point. /// \param theSourceShape Shape be symmetrized /// \param thePoint Point of symmetry static std::shared_ptr makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePoint); + std::shared_ptr thePoint) throw (GeomAlgoAPI_Exception); /// Performs a symmetry by an axis. /// \param theSourceShape Shape be symmetrized /// \param theAxis Axis of symmetry static std::shared_ptr makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr theAxis); + std::shared_ptr theAxis) throw (GeomAlgoAPI_Exception); /// Performs a symmetry by a plane. /// \param theSourceShape Shape be symmetrized /// \param thePlane Plane of symmetry static std::shared_ptr makeSymmetry( std::shared_ptr theSourceShape, - std::shared_ptr thePlane); + std::shared_ptr thePlane) throw (GeomAlgoAPI_Exception); /// Performs a scale by a scale factor. /// \param theSourceShape Shape be scaled @@ -208,7 +213,7 @@ public: static std::shared_ptr makeScale( std::shared_ptr theSourceShape, std::shared_ptr theCenterPoint, - const double theScaleFactor); + const double theScaleFactor) throw (GeomAlgoAPI_Exception); /// Performs a scale by dimensions. /// \param theSourceShape Shape be scaled @@ -221,7 +226,7 @@ public: std::shared_ptr theCenterPoint, const double theScaleFactorX, const double theScaleFactorY, - const double theScaleFactorZ); + const double theScaleFactorZ) throw (GeomAlgoAPI_Exception); /// Performs a multi translation along one axis, at a distance and a number of times /// \param theSourceShape Shape to be moved @@ -233,7 +238,7 @@ public: std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber); + const int theNumber) throw (GeomAlgoAPI_Exception); /// Performs a multi translation along two axis : a different distance on each axis /// and a different number of times for each axis @@ -252,7 +257,7 @@ public: const int theFirstNumber, std::shared_ptr theSecondAxis, const double theSecondStep, - const int theSecondNumber); + const int theSecondNumber) throw (GeomAlgoAPI_Exception); /// Performs a multi rotation along one axis and a number of times /// \param[in] theSourceShape Shape to be rotated @@ -261,7 +266,7 @@ public: static std::shared_ptr makeMultiRotation( std::shared_ptr theSourceShape, std::shared_ptr theAxis, - const int theNumber); + const int theNumber) throw (GeomAlgoAPI_Exception); /// Performs a multi rotation along one axis, at a step and a number of times /// \param theSourceShape Shape to be moved @@ -272,7 +277,7 @@ public: std::shared_ptr theSourceShape, std::shared_ptr theAxis, const double theStep, - const int theNumber); + const int theNumber) throw (GeomAlgoAPI_Exception); /// Creates a cone segment using standard GDML parameters. /// \param theRMin1 Inner radius at base of cone @@ -289,7 +294,7 @@ public: const double theRMax2, const double theZ, const double theStartPhi, - const double theDeltaPhi); + const double theDeltaPhi) throw (GeomAlgoAPI_Exception); }; } #endif