0025246: Make methods Intervals and NbIntervals const in Adaptor3d_Curve and it desce...

Qualifier "const" added to NbIntervals and Intervals functions.

Fixed Standard_OVERRIDE macro description
Removed obsolete method declaration from Standard_Transient.cdl

diff --git a/src/Adaptor3d/Adaptor3d_Curve.cdl b/src/Adaptor3d/Adaptor3d_Curve.cdl
index a204786..e11c657 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_Curve.cdl
+++ b/src/Adaptor3d/Adaptor3d_Curve.cdl
@@ -84,12 +84,12 @@ is
        ---Purpose: 
     is virtual;
     
-    NbIntervals(me:in out; S : Shape from GeomAbs) returns Integer
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
     is virtual;
     
-    Intervals(me:in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/Adaptor3d/Adaptor3d_Curve.cxx b/src/Adaptor3d/Adaptor3d_Curve.cxx
index 376c02f..3530738 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_Curve.cxx
+++ b/src/Adaptor3d/Adaptor3d_Curve.cxx
@@ -67,8 +67,7 @@ GeomAbs_Shape Adaptor3d_Curve::Continuity() const
 //purpose  : 
 //=======================================================================
 
-//Standard_Integer Adaptor3d_Curve::NbIntervals(const GeomAbs_Shape S) const 
-Standard_Integer Adaptor3d_Curve::NbIntervals(const GeomAbs_Shape ) 
+Standard_Integer Adaptor3d_Curve::NbIntervals(const GeomAbs_Shape ) const
 {
   Standard_NotImplemented::Raise("Adaptor3d_Curve::NbIntervals");
   return 0;
@@ -80,8 +79,7 @@ Standard_Integer Adaptor3d_Curve::NbIntervals(const GeomAbs_Shape )
 //purpose  : 
 //=======================================================================
 
-//void Adaptor3d_Curve::Intervals(TColStd_Array1OfReal& T, const GeomAbs_Shape S) const 
-void Adaptor3d_Curve::Intervals(TColStd_Array1OfReal& , const GeomAbs_Shape )  
+void Adaptor3d_Curve::Intervals(TColStd_Array1OfReal& , const GeomAbs_Shape ) const
 {
   Standard_NotImplemented::Raise("Adaptor3d_Curve::Intervals");
 }

diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cdl b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cdl
index 9700ded..acc3d23 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cdl
+++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cdl
@@ -100,12 +100,12 @@ is
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
     
-    NbIntervals(me: in out; S : Shape from GeomAbs) returns Integer
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
     is redefined static;
     
-    Intervals(me:in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
index ea70569..12bdeb1 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
+++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
@@ -812,8 +812,7 @@ static void AddIntervals (const Handle(TColStd_HSequenceOfReal)& theParameters,
 //purpose  : 
 //=======================================================================
 
-Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals
-(const GeomAbs_Shape S)
+Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals (const GeomAbs_Shape S) const
 {
   if(S == myIntCont && !myIntervals.IsNull())
     return myIntervals->Length()-1;
@@ -838,10 +837,10 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals
   // sorted sequence of parameters defining continuity intervals;
   // started with own intervals of curve and completed by 
   // additional points coming from surface discontinuities
-  myIntervals = new TColStd_HSequenceOfReal;
+  Handle(TColStd_HSequenceOfReal) aIntervals = new TColStd_HSequenceOfReal;
   for (Standard_Integer i = 1; i <= nc + 1; i++)
   {
-    myIntervals->Append(TabC(i));
+    aIntervals->Append(TabC(i));
   }
  
   if (nu>1)
@@ -852,7 +851,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals
       U = TabU.Value(iu);
       Adaptor3d_InterFunc Func(myCurve,U,1);
       math_FunctionRoots Resol(Func,Tdeb,Tfin,NbSample,Tol,Tol,Tol,0.);
-      AddIntervals (myIntervals, Resol, Tol);
+      AddIntervals (aIntervals, Resol, Tol);
     }
   }
   if (nv>1)
@@ -863,17 +862,18 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals
       V = TabV.Value(iv);
       Adaptor3d_InterFunc Func(myCurve,V,2);
       math_FunctionRoots Resol(Func,Tdeb,Tfin,NbSample,Tol,Tol,Tol,0.);
-      AddIntervals (myIntervals, Resol, Tol);
+      AddIntervals (aIntervals, Resol, Tol);
     }
   }
 
   // for case intervals==1 and first point == last point SequenceOfReal
   // contains only one value, therefore it is necessary to add second
-  // value into myIntervals which will be equal first value.
-  if (myIntervals->Length() == 1)
-    myIntervals->Append (myIntervals->Value(1));
+  // value into aIntervals which will be equal first value.
+  if (aIntervals->Length() == 1)
+    aIntervals->Append (aIntervals->Value(1));
 
-  myIntCont = S;
+  const_cast<Adaptor3d_CurveOnSurface*>(this)->myIntervals = aIntervals;
+  const_cast<Adaptor3d_CurveOnSurface*>(this)->myIntCont = S;
   return myIntervals->Length() - 1;
 }
 
@@ -883,7 +883,7 @@ Standard_Integer Adaptor3d_CurveOnSurface::NbIntervals
 //=======================================================================
 
 void Adaptor3d_CurveOnSurface::Intervals(TColStd_Array1OfReal& T,
-                                      const GeomAbs_Shape S)  
+                                         const GeomAbs_Shape S) const
 {
   NbIntervals(S);
   Standard_ASSERT_RAISE (T.Length() == myIntervals->Length(), "Error: Wrong size of array buffer in call to Adaptor3d_CurveOnSurface::Intervals");

diff --git a/src/Adaptor3d/Adaptor3d_HCurve.cdl b/src/Adaptor3d/Adaptor3d_HCurve.cdl
index c39f81e..4c568b3 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_HCurve.cdl
+++ b/src/Adaptor3d/Adaptor3d_HCurve.cdl
@@ -85,10 +85,10 @@ is
     Continuity(me) returns Shape from GeomAbs ;
        ---C++: inline
     
-    NbIntervals(me: mutable; S : Shape from GeomAbs) returns Integer;
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer;
        ---C++: inline
     
-    Intervals(me: mutable; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/Adaptor3d/Adaptor3d_HCurve.lxx b/src/Adaptor3d/Adaptor3d_HCurve.lxx
index fd16928..8a81896 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_HCurve.lxx
+++ b/src/Adaptor3d/Adaptor3d_HCurve.lxx
@@ -48,9 +48,9 @@ inline Standard_Real Adaptor3d_HCurve::FirstParameter() const
 //purpose  : 
 //=======================================================================
 
- inline Standard_Integer Adaptor3d_HCurve::NbIntervals(const GeomAbs_Shape S)  
+ inline Standard_Integer Adaptor3d_HCurve::NbIntervals(const GeomAbs_Shape S) const
 {
-  return GetCurve().NbIntervals(S);
+  return Curve().NbIntervals(S);
 }
 
 //=======================================================================
@@ -59,9 +59,9 @@ inline Standard_Real Adaptor3d_HCurve::FirstParameter() const
 //=======================================================================
 
  inline void Adaptor3d_HCurve::Intervals(TColStd_Array1OfReal& T,
-                                      const GeomAbs_Shape S)  
+                                         const GeomAbs_Shape S) const
 {
-  GetCurve().Intervals(T,S);
+  Curve().Intervals(T,S);
 }
 
 //=======================================================================

diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cdl b/src/Adaptor3d/Adaptor3d_IsoCurve.cdl
index 8f50aad..77b499b 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.cdl
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cdl
@@ -120,12 +120,12 @@ is
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
     
-    NbIntervals(me:in out; S : Shape from GeomAbs) returns Integer
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
     is redefined static;
 
-    Intervals(me:in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
index 191de1f..54744b0 100644 (file)
--- a/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
+++ b/src/Adaptor3d/Adaptor3d_IsoCurve.cxx
@@ -229,7 +229,7 @@ GeomAbs_Shape Adaptor3d_IsoCurve::Continuity() const
 //purpose  : 
 //=======================================================================
 
-Standard_Integer Adaptor3d_IsoCurve::NbIntervals(const GeomAbs_Shape S)  
+Standard_Integer Adaptor3d_IsoCurve::NbIntervals(const GeomAbs_Shape S) const
 {
   if (myIso == GeomAbs_NoneIso) Standard_NoSuchObject::Raise();
   Standard_Boolean UIso =  (myIso == GeomAbs_IsoU);
@@ -260,7 +260,7 @@ Standard_Integer Adaptor3d_IsoCurve::NbIntervals(const GeomAbs_Shape S)
 //=======================================================================
 
 void Adaptor3d_IsoCurve::Intervals(TColStd_Array1OfReal& TI,
-                                const GeomAbs_Shape S)  
+                                   const GeomAbs_Shape S) const
 {
   if (myIso == GeomAbs_NoneIso) Standard_NoSuchObject::Raise();
   Standard_Boolean UIso =  (myIso == GeomAbs_IsoU);

diff --git a/src/BRepAdaptor/BRepAdaptor_CompCurve.cdl b/src/BRepAdaptor/BRepAdaptor_CompCurve.cdl
index 0729368..89efb8c 100644 (file)
--- a/src/BRepAdaptor/BRepAdaptor_CompCurve.cdl
+++ b/src/BRepAdaptor/BRepAdaptor_CompCurve.cdl
@@ -107,12 +107,12 @@ is
    Continuity(me) returns Shape from GeomAbs
    is redefined static;
 
-   NbIntervals(me: in out; S : Shape from GeomAbs) returns Integer
+   NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
    is redefined static;
 
-   Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+   Intervals(me; T : in out Array1OfReal from TColStd; 
                 S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx b/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx
index 77d4f53..2b9d895 100644 (file)
--- a/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx
+++ b/src/BRepAdaptor/BRepAdaptor_CompCurve.cxx
@@ -226,7 +226,7 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const
   return myCurves->Value(1).Continuity();
 }
 
- Standard_Integer BRepAdaptor_CompCurve::NbIntervals(const GeomAbs_Shape S)
+ Standard_Integer BRepAdaptor_CompCurve::NbIntervals(const GeomAbs_Shape S) const
 {
   Standard_Integer NbInt, ii;
   for (ii=1, NbInt=0; ii<=myCurves->Length(); ii++)
@@ -236,7 +236,7 @@ const TopoDS_Wire& BRepAdaptor_CompCurve::Wire() const
 }
 
  void BRepAdaptor_CompCurve::Intervals(TColStd_Array1OfReal& T,
-                                      const GeomAbs_Shape S)
+                                       const GeomAbs_Shape S) const
 {
   Standard_Integer ii, jj, kk, n;
   Standard_Real f, F, delta;

diff --git a/src/BRepAdaptor/BRepAdaptor_Curve.cdl b/src/BRepAdaptor/BRepAdaptor_Curve.cdl
index e078c4d..54c1257 100644 (file)
--- a/src/BRepAdaptor/BRepAdaptor_Curve.cdl
+++ b/src/BRepAdaptor/BRepAdaptor_Curve.cdl
@@ -135,12 +135,12 @@ is
    Continuity(me) returns Shape from GeomAbs
    is redefined static;
 
-   NbIntervals(me: in out; S : Shape from GeomAbs) returns Integer
+   NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
    is redefined static;
 
-   Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+   Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/BRepAdaptor/BRepAdaptor_Curve.cxx b/src/BRepAdaptor/BRepAdaptor_Curve.cxx
index e131fe6..947f82d 100644 (file)
--- a/src/BRepAdaptor/BRepAdaptor_Curve.cxx
+++ b/src/BRepAdaptor/BRepAdaptor_Curve.cxx
@@ -236,7 +236,7 @@ GeomAbs_Shape BRepAdaptor_Curve::Continuity() const
 //purpose  : 
 //=======================================================================
 
-Standard_Integer BRepAdaptor_Curve::NbIntervals(const GeomAbs_Shape S) 
+Standard_Integer BRepAdaptor_Curve::NbIntervals(const GeomAbs_Shape S) const
 {
   if (myConSurf.IsNull()) {
     return myCurve.NbIntervals(S);
@@ -252,7 +252,7 @@ Standard_Integer BRepAdaptor_Curve::NbIntervals(const GeomAbs_Shape S)
 //=======================================================================
 
 void BRepAdaptor_Curve::Intervals(TColStd_Array1OfReal& T, 
-                                 const GeomAbs_Shape S)  
+                                  const GeomAbs_Shape S) const
 {
   if (myConSurf.IsNull()) {
     myCurve.Intervals(T, S);

diff --git a/src/ChFiDS/ChFiDS_ElSpine.cdl b/src/ChFiDS/ChFiDS_ElSpine.cdl
index 4253ff1..159917c 100644 (file)
--- a/src/ChFiDS/ChFiDS_ElSpine.cdl
+++ b/src/ChFiDS/ChFiDS_ElSpine.cdl
@@ -59,10 +59,10 @@ is
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
 
-    NbIntervals(me: in out; S : Shape from GeomAbs) 
+    NbIntervals(me; S : Shape from GeomAbs) 
     returns Integer is redefined static;
 
-    Intervals(me: in out; 
+    Intervals(me; 
              T : in out Array1OfReal from TColStd; 
              S : Shape from GeomAbs)
     is redefined static;

diff --git a/src/ChFiDS/ChFiDS_ElSpine.cxx b/src/ChFiDS/ChFiDS_ElSpine.cxx
index d404427..39da672 100644 (file)
--- a/src/ChFiDS/ChFiDS_ElSpine.cxx
+++ b/src/ChFiDS/ChFiDS_ElSpine.cxx
@@ -88,7 +88,7 @@ GeomAbs_Shape ChFiDS_ElSpine::Continuity() const
 //purpose  : 
 //=======================================================================
 
-Standard_Integer ChFiDS_ElSpine::NbIntervals(const GeomAbs_Shape S) 
+Standard_Integer ChFiDS_ElSpine::NbIntervals(const GeomAbs_Shape S) const
 {
   return curve.NbIntervals(S);
 }
@@ -98,7 +98,7 @@ Standard_Integer ChFiDS_ElSpine::NbIntervals(const GeomAbs_Shape S)
 //purpose  : 
 //=======================================================================
 
-void ChFiDS_ElSpine::Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) 
+void ChFiDS_ElSpine::Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) const
 {
   curve.Intervals(T,S);
 }

diff --git a/src/GCPnts/GCPnts_TangentialDeflection.gxx b/src/GCPnts/GCPnts_TangentialDeflection.gxx
index 124ba3c..017e43f 100644 (file)
--- a/src/GCPnts/GCPnts_TangentialDeflection.gxx
+++ b/src/GCPnts/GCPnts_TangentialDeflection.gxx
@@ -267,9 +267,9 @@ void GCPnts_TangentialDeflection::PerformCurve (const TheCurve& C)
   points    .Append (CurrentPoint);
 
   // Used to detect "isLine" current bspline and in Du computation in general handling.
-  Standard_Integer NbInterv = const_cast<TheCurve*>(&C)->NbIntervals(GeomAbs_CN);
+  Standard_Integer NbInterv = C.NbIntervals(GeomAbs_CN);
   TColStd_Array1OfReal Intervs(1, NbInterv+1);
-  const_cast<TheCurve*>(&C)->Intervals(Intervs, GeomAbs_CN);
+  C.Intervals(Intervs, GeomAbs_CN);
 
   if (NotDone) {
     //C'est soit une droite, soit une singularite :

diff --git a/src/GeomAdaptor/GeomAdaptor_Curve.cdl b/src/GeomAdaptor/GeomAdaptor_Curve.cdl
index 1c5774d..c286374 100644 (file)
--- a/src/GeomAdaptor/GeomAdaptor_Curve.cdl
+++ b/src/GeomAdaptor/GeomAdaptor_Curve.cdl
@@ -88,12 +88,12 @@ is
    Continuity(me) returns Shape from GeomAbs
    is redefined static;
 
-   NbIntervals(me:in out; S : Shape from GeomAbs) returns Integer
+   NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
    is redefined static;
 
-   Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+   Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/GeomAdaptor/GeomAdaptor_Curve.cxx b/src/GeomAdaptor/GeomAdaptor_Curve.cxx
index 8cb5a73..05c471f 100644 (file)
--- a/src/GeomAdaptor/GeomAdaptor_Curve.cxx
+++ b/src/GeomAdaptor/GeomAdaptor_Curve.cxx
@@ -204,7 +204,7 @@ GeomAbs_Shape GeomAdaptor_Curve::Continuity() const
 //purpose  : 
 //=======================================================================
 
-Standard_Integer GeomAdaptor_Curve::NbIntervals(const GeomAbs_Shape S) 
+Standard_Integer GeomAdaptor_Curve::NbIntervals(const GeomAbs_Shape S) const
 {
   Standard_Integer myNbIntervals = 1;
   Standard_Integer NbSplit;
@@ -324,7 +324,7 @@ Standard_Integer GeomAdaptor_Curve::NbIntervals(const GeomAbs_Shape S)
 //=======================================================================
 
 void GeomAdaptor_Curve::Intervals(TColStd_Array1OfReal& T,
-                                 const GeomAbs_Shape S   )  
+                                  const GeomAbs_Shape S   ) const
 {
   Standard_Integer myNbIntervals = 1;
   Standard_Integer NbSplit;

diff --git a/src/GeomFill/GeomFill_SnglrFunc.cdl b/src/GeomFill/GeomFill_SnglrFunc.cdl
index 2fff588..afb44f3 100644 (file)
--- a/src/GeomFill/GeomFill_SnglrFunc.cdl
+++ b/src/GeomFill/GeomFill_SnglrFunc.cdl
@@ -43,12 +43,12 @@ is
     LastParameter(me) returns Real
       is redefined static; 
      
-    NbIntervals(me: in out; S : Shape from GeomAbs) returns Integer
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(me) >= <S>
     is redefined static;
     
-    Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/GeomFill/GeomFill_SnglrFunc.cxx b/src/GeomFill/GeomFill_SnglrFunc.cxx
index 6fce846..8c2eef4 100644 (file)
--- a/src/GeomFill/GeomFill_SnglrFunc.cxx
+++ b/src/GeomFill/GeomFill_SnglrFunc.cxx
@@ -38,7 +38,7 @@ void GeomFill_SnglrFunc::SetRatio(const Standard_Real Ratio)
   return myHCurve->LastParameter();
 }
 
- Standard_Integer GeomFill_SnglrFunc::NbIntervals(const GeomAbs_Shape S) 
+ Standard_Integer GeomFill_SnglrFunc::NbIntervals(const GeomAbs_Shape S) const
 {
   GeomAbs_Shape HCS=GeomAbs_C0;
   switch(S) {
@@ -50,7 +50,7 @@ void GeomFill_SnglrFunc::SetRatio(const Standard_Real Ratio)
   return myHCurve->NbIntervals(HCS);
 }
 
- void GeomFill_SnglrFunc::Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) 
+ void GeomFill_SnglrFunc::Intervals(TColStd_Array1OfReal& T,const GeomAbs_Shape S) const
 {
   GeomAbs_Shape HCS=GeomAbs_C0;
   switch(S) {

diff --git a/src/HLRBRep/HLRBRep_BCurveTool.cdl b/src/HLRBRep/HLRBRep_BCurveTool.cdl
index 0ea51a4..2900fab 100644 (file)
--- a/src/HLRBRep/HLRBRep_BCurveTool.cdl
+++ b/src/HLRBRep/HLRBRep_BCurveTool.cdl
@@ -76,14 +76,14 @@ is
        ---Purpose: 
        ---C++: inline
     
-    NbIntervals(myclass; C : in out Curve from BRepAdaptor;
+    NbIntervals(myclass; C : Curve from BRepAdaptor;
                          S : Shape from GeomAbs)
     returns Integer from Standard;
        ---Purpose: Returns  the number  of  intervals for  continuity
        --          <S>. May be one if Continuity(myclass) >= <S>
        ---C++: inline
     
-    Intervals(myclass; C : in out Curve        from BRepAdaptor;
+    Intervals(myclass; C : Curve        from BRepAdaptor;
                        T : in out Array1OfReal from TColStd; 
                       S :        Shape        from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals

diff --git a/src/HLRBRep/HLRBRep_BCurveTool.lxx b/src/HLRBRep/HLRBRep_BCurveTool.lxx
index 96e9654..de38495 100644 (file)
--- a/src/HLRBRep/HLRBRep_BCurveTool.lxx
+++ b/src/HLRBRep/HLRBRep_BCurveTool.lxx
@@ -57,8 +57,8 @@ HLRBRep_BCurveTool::Continuity (const BRepAdaptor_Curve& C)
 //=======================================================================
 
 inline Standard_Integer
-HLRBRep_BCurveTool::NbIntervals(BRepAdaptor_Curve& C,
-                               const GeomAbs_Shape Sh)
+HLRBRep_BCurveTool::NbIntervals(const BRepAdaptor_Curve& C,
+                                const GeomAbs_Shape Sh)
 { return(C.NbIntervals(Sh)); }
 
 //=======================================================================
@@ -67,9 +67,9 @@ HLRBRep_BCurveTool::NbIntervals(BRepAdaptor_Curve& C,
 //=======================================================================
 
 inline void
-HLRBRep_BCurveTool::Intervals(BRepAdaptor_Curve& C,
-                             TColStd_Array1OfReal& Tab,
-                             const GeomAbs_Shape Sh)
+HLRBRep_BCurveTool::Intervals(const BRepAdaptor_Curve& C,
+                              TColStd_Array1OfReal& Tab,
+                              const GeomAbs_Shape Sh)
 { C.Intervals(Tab,Sh); }
 
 //=======================================================================

diff --git a/src/HLRBRep/HLRBRep_Curve.cdl b/src/HLRBRep/HLRBRep_Curve.cdl
index 7ba503e..e3694c2 100644 (file)
--- a/src/HLRBRep/HLRBRep_Curve.cdl
+++ b/src/HLRBRep/HLRBRep_Curve.cdl
@@ -155,7 +155,7 @@ is
        ---C++: inline
     is static;
     
-    NbIntervals(me: in out; S : Shape from GeomAbs)
+    NbIntervals(me; S : Shape from GeomAbs)
     returns Integer from Standard
        ---Purpose: If necessary,  breaks the  curve in  intervals  of
        --          continuity  <S>.    And  returns   the number   of
@@ -163,7 +163,7 @@ is
        ---C++: inline
     is static;
 
-    Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/HLRBRep/HLRBRep_Curve.lxx b/src/HLRBRep/HLRBRep_Curve.lxx
index 107f277..0fa562a 100644 (file)
--- a/src/HLRBRep/HLRBRep_Curve.lxx
+++ b/src/HLRBRep/HLRBRep_Curve.lxx
@@ -107,8 +107,7 @@ inline GeomAbs_Shape  HLRBRep_Curve::Continuity() const
 //purpose  : 
 //=======================================================================
 
-inline Standard_Integer  HLRBRep_Curve::NbIntervals
-  (const GeomAbs_Shape S)  
+inline Standard_Integer  HLRBRep_Curve::NbIntervals (const GeomAbs_Shape S) const
 { return HLRBRep_BCurveTool::NbIntervals(myCurve,S); }
 
 //=======================================================================
@@ -117,7 +116,7 @@ inline Standard_Integer  HLRBRep_Curve::NbIntervals
 //=======================================================================
 
 inline void HLRBRep_Curve::Intervals(TColStd_Array1OfReal& Tab,
-                                    const GeomAbs_Shape Sh) 
+                                     const GeomAbs_Shape Sh) const
 { HLRBRep_BCurveTool::Intervals(myCurve,Tab,Sh); }
 
 

diff --git a/src/ProjLib/ProjLib_ProjectOnPlane.cdl b/src/ProjLib/ProjLib_ProjectOnPlane.cdl
index aeba9b5..19619ac 100644 (file)
--- a/src/ProjLib/ProjLib_ProjectOnPlane.cdl
+++ b/src/ProjLib/ProjLib_ProjectOnPlane.cdl
@@ -120,13 +120,13 @@ is
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
     
-    NbIntervals(me: in out; S : Shape from GeomAbs) returns Integer
+    NbIntervals(me; S : Shape from GeomAbs) returns Integer
        ---Purpose: If necessary,  breaks the  curve in  intervals  of
        --          continuity  <S>.    And  returns   the number   of
        --          intervals.
     is redefined static;
     
-    Intervals(me: in out; T : in out Array1OfReal from TColStd; 
+    Intervals(me; T : in out Array1OfReal from TColStd; 
                  S : Shape from GeomAbs)
        ---Purpose: Stores in <T> the  parameters bounding the intervals
        --          of continuity <S>.

diff --git a/src/ProjLib/ProjLib_ProjectOnPlane.cxx b/src/ProjLib/ProjLib_ProjectOnPlane.cxx
index 8cf7b1d..ae895cc 100644 (file)
--- a/src/ProjLib/ProjLib_ProjectOnPlane.cxx
+++ b/src/ProjLib/ProjLib_ProjectOnPlane.cxx
@@ -943,7 +943,7 @@ GeomAbs_Shape ProjLib_ProjectOnPlane::Continuity() const
 //purpose  : 
 //=======================================================================
 
-Standard_Integer ProjLib_ProjectOnPlane::NbIntervals(const GeomAbs_Shape S) 
+Standard_Integer ProjLib_ProjectOnPlane::NbIntervals(const GeomAbs_Shape S) const
 {
   return myCurve->NbIntervals(S) ;
 }
@@ -955,7 +955,7 @@ Standard_Integer ProjLib_ProjectOnPlane::NbIntervals(const GeomAbs_Shape S)
 //=======================================================================
 
 void ProjLib_ProjectOnPlane::Intervals(TColStd_Array1OfReal& T, 
-                                      const GeomAbs_Shape S) 
+                                       const GeomAbs_Shape S) const
 {
   myCurve->Intervals(T,S) ;
 }

diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx
index 9a47dd9..869f935 100644 (file)
--- a/src/Standard/Standard_Macro.hxx
+++ b/src/Standard/Standard_Macro.hxx
@@ -27,7 +27,7 @@
   // part of C++11 standard
   #define Standard_OVERRIDE override
 #elif defined(_MSC_VER) && (_MSC_VER >= 1700)
-  // MSVC extension since VS2005
+  // MSVC extension since VS2012
   #define Standard_OVERRIDE override
 #else
   #define Standard_OVERRIDE

diff --git a/src/Standard/Standard_Transient.cdl b/src/Standard/Standard_Transient.cdl
index 27058cf..a7f6aad 100644 (file)
--- a/src/Standard/Standard_Transient.cdl
+++ b/src/Standard/Standard_Transient.cdl
@@ -35,12 +35,6 @@ is
            ---C++: alias "Standard_Transient(const Standard_Transient&) : count(0) {}"
            ---C++: alias "Standard_Transient& operator= (const Standard_Transient&) { return *this; }"
 
-       HashCode (me; Upper : Integer ) returns Integer is virtual;
-           ---Purpose: Returns a hashed value denoting <me>. This value is in
-           --         the range 1..<Upper>.
-           ---C++:  function call
-           ---Level: Advanced
-
         Delete(me) is  virtual;
             ---Purpose: Memory deallocator for transient classes
             ---Level: Advanced