From: Pasukhin Dmitry <dpasukhi@opencascade.com>
Date: Sun, 23 Nov 2025 20:52:02 +0000 (+0000)
Subject: Foundation classes - Formatting fixes for deprecated (#851)
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=845e75e598a790a02768def2c0eff2d258f65f6f;p=occt.git

Foundation classes - Formatting fixes for deprecated (#851)

- Removed empty lines following `Standard_DEPRECATED` macro declarations to improve code consistency
- Removed `[[nodiscard]]` attributes from deprecated functions in Standard_Real, Standard_ShortReal, and Standard_Integer headers to resolve compiler compatibility issues
- Updated the clang-format-check action's regex pattern to better handle `Standard_DEPRECATED` macro variations
---

diff --git a/.github/actions/clang-format-check/action.yml b/.github/actions/clang-format-check/action.yml
index a5d5b2a6ef..722e214508 100644
--- a/.github/actions/clang-format-check/action.yml
+++ b/.github/actions/clang-format-check/action.yml
@@ -90,7 +90,7 @@ runs:
         $files = Get-Content "changed_files.txt" | Where-Object { Test-Path $_ }
         $files | ForEach-Object {
           $content = Get-Content $_ -Raw
-          $pattern = '(Standard_DEPRECATED\("[a-z0-9\.,;\s\(\)_-]+"(?:[\s\n]+"[a-z0-9\.,;\s\(\)_-]+")?\)\n)\n+'
+          $pattern = '(Standard_DEPRECATED\s*\(\s*"[^"]*"(?:\s*"[^"]*")*\s*\)\n)\n+'
           $newContent = $content -replace $pattern, '$1'
           if ($content -ne $newContent) {
             Set-Content -Path $_ -Value $newContent -NoNewline
diff --git a/src/FoundationClasses/TKernel/Standard/Standard_Integer.hxx b/src/FoundationClasses/TKernel/Standard/Standard_Integer.hxx
index d943597be4..7c89223540 100755
--- a/src/FoundationClasses/TKernel/Standard/Standard_Integer.hxx
+++ b/src/FoundationClasses/TKernel/Standard/Standard_Integer.hxx
@@ -45,8 +45,7 @@
 //! Equivalent to std::max.
 Standard_DEPRECATED("This function duplicates std::max and will be removed in future releases. "
                     "Use std::max instead.")
-
-[[nodiscard]] constexpr int Max(const int theValue1, const int theValue2)
+constexpr int Max(const int theValue1, const int theValue2)
 {
   return (std::max)(theValue1, theValue2);
 }
@@ -55,8 +54,7 @@ Standard_DEPRECATED("This function duplicates std::max and will be removed in fu
 //! Equivalent to std::min.
 Standard_DEPRECATED("This function duplicates std::min and will be removed in future releases. "
                     "Use std::min instead.")
-
-[[nodiscard]] constexpr int Min(const int theValue1, const int theValue2)
+constexpr int Min(const int theValue1, const int theValue2)
 {
   return (std::min)(theValue1, theValue2);
 }
diff --git a/src/FoundationClasses/TKernel/Standard/Standard_Real.hxx b/src/FoundationClasses/TKernel/Standard/Standard_Real.hxx
index caba059587..e16d62b2c8 100644
--- a/src/FoundationClasses/TKernel/Standard/Standard_Real.hxx
+++ b/src/FoundationClasses/TKernel/Standard/Standard_Real.hxx
@@ -32,8 +32,7 @@
 //! Returns the value of the arc cosine of a @p theValue.
 Standard_DEPRECATED("This function duplicates std::acos and will be removed in future releases. "
                     "Use std::acos instead.")
-
-[[nodiscard]] inline double ACos(const double theValue)
+inline double ACos(const double theValue)
 {
   return std::acos(theValue);
 }
@@ -47,8 +46,7 @@ Standard_EXPORT [[nodiscard]] double ACosApprox(const double theValue);
 //! Returns the value of the arc sine of a @p theValue.
 Standard_DEPRECATED("This function duplicates std::asin and will be removed in future releases. "
                     "Use std::asin instead.")
-
-[[nodiscard]] inline double ASin(const double theValue)
+inline double ASin(const double theValue)
 {
   return std::asin(theValue);
 }
@@ -57,8 +55,7 @@ Standard_DEPRECATED("This function duplicates std::asin and will be removed in f
 //! arguments to determine the quadrant of the return value.
 Standard_DEPRECATED("This function duplicates std::atan2 and will be removed in future releases. "
                     "Use std::atan2 instead.")
-
-[[nodiscard]] inline double ATan2(const double theX, const double theY)
+inline double ATan2(const double theX, const double theY)
 {
   return std::atan2(theX, theY);
 }
@@ -66,8 +63,7 @@ Standard_DEPRECATED("This function duplicates std::atan2 and will be removed in
 //! Returns the value of the hyperbolic arc tangent of @p theValue.
 Standard_DEPRECATED("This function duplicates std::atanh and will be removed in future releases. "
                     "Use std::atanh instead.")
-
-[[nodiscard]] inline double ATanh(const double theValue)
+inline double ATanh(const double theValue)
 {
   return std::atanh(theValue);
 }
@@ -75,8 +71,7 @@ Standard_DEPRECATED("This function duplicates std::atanh and will be removed in
 //! Returns the value of the hyperbolic arc cosine of @p theValue.
 Standard_DEPRECATED("This function duplicates std::acosh and will be removed in future releases. "
                     "Use std::acosh instead.")
-
-[[nodiscard]] inline double ACosh(const double theValue)
+inline double ACosh(const double theValue)
 {
   return std::acosh(theValue);
 }
@@ -84,8 +79,7 @@ Standard_DEPRECATED("This function duplicates std::acosh and will be removed in
 //! Returns the hyperbolic cosine of a double @p theValue.
 Standard_DEPRECATED("This function duplicates std::cosh and will be removed in future releases. "
                     "Use std::cosh instead.")
-
-[[nodiscard]] inline double Cosh(const double theValue)
+inline double Cosh(const double theValue)
 {
   return std::cosh(theValue);
 }
@@ -93,8 +87,7 @@ Standard_DEPRECATED("This function duplicates std::cosh and will be removed in f
 //! Returns the hyperbolic sine of a double @p theValue.
 Standard_DEPRECATED("This function duplicates std::sinh and will be removed in future releases. "
                     "Use std::sinh instead.")
-
-[[nodiscard]] inline double Sinh(const double theValue)
+inline double Sinh(const double theValue)
 {
   return std::sinh(theValue);
 }
@@ -102,8 +95,7 @@ Standard_DEPRECATED("This function duplicates std::sinh and will be removed in f
 //! Computes the natural (base-e) logarithm of number @p theValue.
 Standard_DEPRECATED("This function duplicates std::log and will be removed in future releases. "
                     "Use std::log instead.")
-
-[[nodiscard]] inline double Log(const double theValue)
+inline double Log(const double theValue)
 {
   return std::log(theValue);
 }
@@ -111,8 +103,7 @@ Standard_DEPRECATED("This function duplicates std::log and will be removed in fu
 //! Returns the square root of a double @p theValue.
 Standard_DEPRECATED("This function duplicates std::sqrt and will be removed in future releases. "
                     "Use std::sqrt instead.")
-
-[[nodiscard]] inline double Sqrt(const double theValue)
+inline double Sqrt(const double theValue)
 {
   return std::sqrt(theValue);
 }
@@ -122,8 +113,7 @@ Standard_DEPRECATED("This function duplicates std::sqrt and will be removed in f
 Standard_DEPRECATED(
   "This function duplicates std::nextafter and will be removed in future releases. "
   "Use std::nextafter instead.")
-
-[[nodiscard]] inline double NextAfter(const double theValue, const double theDirection)
+inline double NextAfter(const double theValue, const double theDirection)
 {
   return std::nextafter(theValue, theDirection);
 }
@@ -133,8 +123,7 @@ Standard_DEPRECATED(
 Standard_DEPRECATED(
   "This function duplicates std::copysign and will be removed in future releases. "
   "Use std::copysign instead.")
-
-[[nodiscard]] inline double Sign(const double theMagnitude, const double theSign)
+inline double Sign(const double theMagnitude, const double theSign)
 {
   return std::copysign(theMagnitude, theSign);
 }
@@ -149,8 +138,7 @@ Standard_DEPRECATED(
 //! Equivalent to std::abs.
 Standard_DEPRECATED("This function duplicates std::abs and will be removed in future releases. "
                     "Use std::abs instead.")
-
-[[nodiscard]] inline double Abs(const double theValue)
+inline double Abs(const double theValue)
 {
   return std::abs(theValue);
 }
@@ -226,8 +214,7 @@ Standard_DEPRECATED("This function duplicates std::abs and will be removed in fu
 //! Returns the value of the arc tangent of a double @p theValue.
 Standard_DEPRECATED("This function duplicates std::atan and will be removed in future releases. "
                     "Use std::atan instead.")
-
-[[nodiscard]] inline double ATan(const double theValue)
+inline double ATan(const double theValue)
 {
   return std::atan(theValue);
 }
@@ -235,8 +222,7 @@ Standard_DEPRECATED("This function duplicates std::atan and will be removed in f
 //! Returns the next integer greater than or equal to a double @p theValue.
 Standard_DEPRECATED("This function duplicates std::ceil and will be removed in future releases. "
                     "Use std::ceil instead.")
-
-[[nodiscard]] inline double Ceiling(const double theValue)
+inline double Ceiling(const double theValue)
 {
   return std::ceil(theValue);
 }
@@ -245,8 +231,7 @@ Standard_DEPRECATED("This function duplicates std::ceil and will be removed in f
 //! Equivalent to std::cos.
 Standard_DEPRECATED("This function duplicates std::cos and will be removed in future releases. "
                     "Use std::cos instead.")
-
-[[nodiscard]] inline double Cos(const double theValue)
+inline double Cos(const double theValue)
 {
   return std::cos(theValue);
 }
@@ -264,8 +249,7 @@ Standard_DEPRECATED("This function duplicates std::cos and will be removed in fu
 //! Equivalent to std::exp.
 Standard_DEPRECATED("This function duplicates std::exp and will be removed in future releases. "
                     "Use std::exp instead.")
-
-[[nodiscard]] inline double Exp(const double theValue)
+inline double Exp(const double theValue)
 {
   return std::exp(theValue);
 }
@@ -274,8 +258,7 @@ Standard_DEPRECATED("This function duplicates std::exp and will be removed in fu
 //! Equivalent to std::floor.
 Standard_DEPRECATED("This function duplicates std::floor and will be removed in future releases. "
                     "Use std::floor instead.")
-
-[[nodiscard]] inline double Floor(const double theValue)
+inline double Floor(const double theValue)
 {
   return std::floor(theValue);
 }
@@ -284,8 +267,7 @@ Standard_DEPRECATED("This function duplicates std::floor and will be removed in
 //! Equivalent to std::trunc.
 Standard_DEPRECATED("This function duplicates std::trunc and will be removed in future releases. "
                     "Use std::trunc instead.")
-
-[[nodiscard]] inline double IntegerPart(const double theValue)
+inline double IntegerPart(const double theValue)
 {
   return std::trunc(theValue);
 }
@@ -294,8 +276,7 @@ Standard_DEPRECATED("This function duplicates std::trunc and will be removed in
 //! Equivalent to std::log10.
 Standard_DEPRECATED("This function duplicates std::log10 and will be removed in future releases. "
                     "Use std::log10 instead.")
-
-[[nodiscard]] inline double Log10(const double theValue)
+inline double Log10(const double theValue)
 {
   return std::log10(theValue);
 }
@@ -304,8 +285,7 @@ Standard_DEPRECATED("This function duplicates std::log10 and will be removed in
 //! Equivalent to std::max.
 Standard_DEPRECATED("This function duplicates std::max and will be removed in future releases. "
                     "Use std::max instead.")
-
-[[nodiscard]] constexpr double Max(const double theValue1, const double theValue2)
+constexpr double Max(const double theValue1, const double theValue2)
 {
   return (std::max)(theValue1, theValue2);
 }
@@ -314,8 +294,7 @@ Standard_DEPRECATED("This function duplicates std::max and will be removed in fu
 //! Equivalent to std::min.
 Standard_DEPRECATED("This function duplicates std::min and will be removed in future releases. "
                     "Use std::min instead.")
-
-[[nodiscard]] constexpr double Min(const double theValue1, const double theValue2)
+constexpr double Min(const double theValue1, const double theValue2)
 {
   return (std::min)(theValue1, theValue2);
 }
@@ -323,8 +302,7 @@ Standard_DEPRECATED("This function duplicates std::min and will be removed in fu
 //! Returns a double @p theValue raised to the power of @p thePower.
 Standard_DEPRECATED("This function duplicates std::pow and will be removed in future releases. "
                     "Use std::pow instead.")
-
-[[nodiscard]] inline double Pow(const double theValue, const double thePower)
+inline double Pow(const double theValue, const double thePower)
 {
   return std::pow(theValue, thePower);
 }
@@ -363,8 +341,7 @@ Standard_DEPRECATED("This function duplicates std::pow and will be removed in fu
 //! Equivalent to std::round.
 Standard_DEPRECATED("This function duplicates std::round and will be removed in future releases. "
                     "Use std::round instead.")
-
-[[nodiscard]] inline double Round(const double theValue)
+inline double Round(const double theValue)
 {
   return std::round(theValue);
 }
@@ -373,8 +350,7 @@ Standard_DEPRECATED("This function duplicates std::round and will be removed in
 //! Equivalent to std::sin.
 Standard_DEPRECATED("This function duplicates std::sin and will be removed in future releases. "
                     "Use std::sin instead.")
-
-[[nodiscard]] inline double Sin(const double theValue)
+inline double Sin(const double theValue)
 {
   return std::sin(theValue);
 }
@@ -383,8 +359,7 @@ Standard_DEPRECATED("This function duplicates std::sin and will be removed in fu
 //! Equivalent to std::asinh.
 Standard_DEPRECATED("This function duplicates std::asinh and will be removed in future releases. "
                     "Use std::asinh instead.")
-
-[[nodiscard]] inline double ASinh(const double theValue)
+inline double ASinh(const double theValue)
 {
   return std::asinh(theValue);
 }
@@ -399,8 +374,7 @@ Standard_DEPRECATED("This function duplicates std::asinh and will be removed in
 //! Equivalent to std::tan.
 Standard_DEPRECATED("This function duplicates std::tan and will be removed in future releases. "
                     "Use std::tan instead.")
-
-[[nodiscard]] inline double Tan(const double theValue)
+inline double Tan(const double theValue)
 {
   return std::tan(theValue);
 }
@@ -409,8 +383,7 @@ Standard_DEPRECATED("This function duplicates std::tan and will be removed in fu
 //! Equivalent to std::tanh.
 Standard_DEPRECATED("This function duplicates std::tanh and will be removed in future releases. "
                     "Use std::tanh instead.")
-
-[[nodiscard]] inline double Tanh(const double theValue)
+inline double Tanh(const double theValue)
 {
   return std::tanh(theValue);
 }
diff --git a/src/FoundationClasses/TKernel/Standard/Standard_ShortReal.hxx b/src/FoundationClasses/TKernel/Standard/Standard_ShortReal.hxx
index 28915cdc37..eebc2f7564 100644
--- a/src/FoundationClasses/TKernel/Standard/Standard_ShortReal.hxx
+++ b/src/FoundationClasses/TKernel/Standard/Standard_ShortReal.hxx
@@ -32,8 +32,7 @@
 //! Equivalent to std::abs.
 Standard_DEPRECATED("This function duplicates std::abs and will be removed in future releases. "
                     "Use std::abs instead.")
-
-[[nodiscard]] inline float Abs(const float theValue)
+inline float Abs(const float theValue)
 {
   return std::abs(theValue);
 }
@@ -96,8 +95,7 @@ Standard_DEPRECATED("This function duplicates std::abs and will be removed in fu
 //! Equivalent to std::max.
 Standard_DEPRECATED("This function duplicates std::max and will be removed in future releases. "
                     "Use std::max instead.")
-
-[[nodiscard]] constexpr float Max(const float theValue1, const float theValue2)
+constexpr float Max(const float theValue1, const float theValue2)
 {
   return (std::max)(theValue1, theValue2);
 }
@@ -106,8 +104,7 @@ Standard_DEPRECATED("This function duplicates std::max and will be removed in fu
 //! Equivalent to std::min.
 Standard_DEPRECATED("This function duplicates std::min and will be removed in future releases. "
                     "Use std::min instead.")
-
-[[nodiscard]] constexpr float Min(const float theValue1, const float theValue2)
+constexpr float Min(const float theValue1, const float theValue2)
 {
   return (std::min)(theValue1, theValue2);
 }
diff --git a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx
index bf6df52b42..7e7b127640 100644
--- a/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx
+++ b/src/Visualization/TKOpenGl/OpenGl/OpenGl_Texture.hxx
@@ -227,7 +227,6 @@ public:
 public:
   Standard_DEPRECATED("Deprecated method, OpenGl_TextureFormat::FindFormat() should be used "
                       "instead")
-
   static bool GetDataFormat(const Handle(OpenGl_Context)& theCtx,
                             const Image_Format            theFormat,
                             Standard_Integer&             theTextFormat,
@@ -243,7 +242,6 @@ public:
 
   Standard_DEPRECATED("Deprecated method, OpenGl_TextureFormat::FindFormat() should be used "
                       "instead")
-
   static bool GetDataFormat(const Handle(OpenGl_Context)& theCtx,
                             const Image_PixMap&           theData,
                             Standard_Integer&             theTextFormat,
diff --git a/src/Visualization/TKV3d/AIS/AIS_ColorScale.hxx b/src/Visualization/TKV3d/AIS/AIS_ColorScale.hxx
index 9f356a3068..578199577f 100644
--- a/src/Visualization/TKV3d/AIS/AIS_ColorScale.hxx
+++ b/src/Visualization/TKV3d/AIS/AIS_ColorScale.hxx
@@ -287,7 +287,6 @@ public:
 
   //! Sets the color scale title position.
   Standard_DEPRECATED("AIS_ColorScale::SetTitlePosition() has no effect!")
-
   void SetTitlePosition(const Aspect_TypeOfColorScalePosition thePos) { myTitlePos = thePos; }
 
   //! Returns TRUE if the labels and colors used in reversed order, FALSE by default.
diff --git a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx
index b5d5a52986..edee1ddae3 100644
--- a/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx
+++ b/src/Visualization/TKV3d/AIS/AIS_InteractiveContext.hxx
@@ -1351,7 +1351,6 @@ public:
   //! those selected in open local context, selected objects.
   Standard_DEPRECATED(
     "Local Context is deprecated - local selection should be used without Local Context")
-
   Standard_Boolean IsCurrent(const Handle(AIS_InteractiveObject)& theObject) const
   {
     return IsSelected(theObject);
@@ -1369,7 +1368,6 @@ public:
   //! selected in open local context, selected objects.
   Standard_DEPRECATED(
     "Local Context is deprecated - local selection should be used without Local Context")
-
   Standard_Boolean MoreCurrent() const { return MoreSelected(); }
 
   //! Continues the scan to the next object in the list of current objects.
@@ -1384,12 +1382,10 @@ public:
   //! selected in open local context, selected objects.
   Standard_DEPRECATED(
     "Local Context is deprecated - local selection should be used without Local Context")
-
   Handle(AIS_InteractiveObject) Current() const { return SelectedInteractive(); }
 
   Standard_DEPRECATED(
     "Local Context is deprecated - local selection should be used without Local Context")
-
   Standard_Integer NbCurrents() { return NbSelected(); }
 
   //! Highlights current objects.
diff --git a/src/Visualization/TKV3d/Prs3d/Prs3d_DatumAspect.hxx b/src/Visualization/TKV3d/Prs3d/Prs3d_DatumAspect.hxx
index 739f25d2a1..e62f0f7988 100644
--- a/src/Visualization/TKV3d/Prs3d/Prs3d_DatumAspect.hxx
+++ b/src/Visualization/TKV3d/Prs3d/Prs3d_DatumAspect.hxx
@@ -131,7 +131,6 @@ public:
   //! Returns the text attributes for rendering labels.
   Standard_DEPRECATED(
     "This method is deprecated - TextAspect() with axis parameter should be called instead")
-
   const Handle(Prs3d_TextAspect)& TextAspect() const
   {
     return myTextAspects[Prs3d_DatumParts_XAxis];
diff --git a/src/Visualization/TKV3d/Prs3d/Prs3d_Root.hxx b/src/Visualization/TKV3d/Prs3d/Prs3d_Root.hxx
index 36dd3f4633..c9ed4003af 100644
--- a/src/Visualization/TKV3d/Prs3d/Prs3d_Root.hxx
+++ b/src/Visualization/TKV3d/Prs3d/Prs3d_Root.hxx
@@ -31,7 +31,6 @@ public:
 
   Standard_DEPRECATED("This method is deprecated - Prs3d_Presentation::CurrentGroup() should be "
                       "called instead")
-
   static Handle(Graphic3d_Group) CurrentGroup(const Handle(Prs3d_Presentation)& thePrs3d)
   {
     return thePrs3d->CurrentGroup();
@@ -39,7 +38,6 @@ public:
 
   Standard_DEPRECATED("This method is deprecated - Prs3d_Presentation::NewGroup() should be called "
                       "instead")
-
   static Handle(Graphic3d_Group) NewGroup(const Handle(Prs3d_Presentation)& thePrs3d)
   {
     return thePrs3d->NewGroup();
diff --git a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx
index 4f30de724c..96971cd637 100644
--- a/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx
+++ b/src/Visualization/TKV3d/PrsMgr/PrsMgr_PresentableObject.hxx
@@ -582,7 +582,6 @@ protected:
   //! Recomputes all presentations of the object.
   Standard_DEPRECATED("This method is deprecated - SetToUpdate() + UpdatePresentations() should be "
                       "called instead")
-
   void Update(Standard_Boolean theToIncludeHidden = Standard_False)
   {
     SetToUpdate();