0024023: Revamp the OCCT Handle -- GC

Implementation of operator of type casting to resulting object simplified in classes of GC and GCE2d packages

diff --git a/src/GC/GC_MakeArcOfCircle.cdl b/src/GC/GC_MakeArcOfCircle.cdl
index 75364905fcc1c108bd49a1eb0b627853289c60fd..38afa0e76681928791ec1cd54bf7672676c571b2 100644 (file)
--- a/src/GC/GC_MakeArcOfCircle.cdl
+++ b/src/GC/GC_MakeArcOfCircle.cdl
@@ -95,11 +95,7 @@ Value(me) returns TrimmedCurve from Geom
     ---Purpose: Returns the constructed arc of circle.
     -- Exceptions StdFail_NotDone if no arc of circle is constructed.
     ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+    ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeArcOfCircle.cxx b/src/GC/GC_MakeArcOfCircle.cxx
index 41d22e2f75b577efa28f84e735bc5060d0a081f0..866dbe35b8af51f8ca490df338a9733551230226 100644 (file)
--- a/src/GC/GC_MakeArcOfCircle.cxx
+++ b/src/GC/GC_MakeArcOfCircle.cxx
@@ -161,20 +161,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-//=======================================================================
-//function : Operator
-//purpose  : 
-//=======================================================================
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-//=======================================================================
-//function : operator
-//purpose  : 
-//=======================================================================
-GC_MakeArcOfCircle::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeArcOfEllipse.cdl b/src/GC/GC_MakeArcOfEllipse.cdl
index cd1555764aabd7879454e7d5c9f9b91cbeccfbae..d9c1fcf9a37142d3f764b07ecbb53026e26d208d 100644 (file)
--- a/src/GC/GC_MakeArcOfEllipse.cdl
+++ b/src/GC/GC_MakeArcOfEllipse.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeArcOfEllipse.cxx b/src/GC/GC_MakeArcOfEllipse.cxx
index fc859d838c767439676029dda0956cd051a79fd5..ceb77ff3ab48cf08dc1c57a7625f86da4c234ea8 100644 (file)
--- a/src/GC/GC_MakeArcOfEllipse.cxx
+++ b/src/GC/GC_MakeArcOfEllipse.cxx
@@ -57,17 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfEllipse::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-

diff --git a/src/GC/GC_MakeArcOfHyperbola.cdl b/src/GC/GC_MakeArcOfHyperbola.cdl
index 61497269ee37a2f1ffe4f482a4844753836c254c..439c03f41d24a6ef6b91636a32e3aebd79555a2f 100644 (file)
--- a/src/GC/GC_MakeArcOfHyperbola.cdl
+++ b/src/GC/GC_MakeArcOfHyperbola.cdl
@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
        --- Purpose: Returns the constructed arc of hyperbola.
        ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeArcOfHyperbola.cxx b/src/GC/GC_MakeArcOfHyperbola.cxx
index 26bf6454e25fe4d6148126b54fe01523ab2e3f48..ffbca7bc57115a87ce11c878ad06281f4e863e05 100644 (file)
--- a/src/GC/GC_MakeArcOfHyperbola.cxx
+++ b/src/GC/GC_MakeArcOfHyperbola.cxx
@@ -58,14 +58,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfHyperbola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeArcOfParabola.cdl b/src/GC/GC_MakeArcOfParabola.cdl
index e763aed051f53c9c3fb6b9dc2db9e3d2c5c8664c..0aafdc03d81b0416d0b6d00629dc65ce2989e8fa 100644 (file)
--- a/src/GC/GC_MakeArcOfParabola.cdl
+++ b/src/GC/GC_MakeArcOfParabola.cdl
@@ -60,11 +60,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
        ---Purpose: Returns the constructed arc of parabola.
        ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeArcOfParabola.cxx b/src/GC/GC_MakeArcOfParabola.cxx
index acb1d0059a7d7de97dec8500e074b709c672c15f..b388ba55c721bbf403dad414ef1cc27ec47e4398 100644 (file)
--- a/src/GC/GC_MakeArcOfParabola.cxx
+++ b/src/GC/GC_MakeArcOfParabola.cxx
@@ -57,14 +57,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeArcOfParabola::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeCircle.cdl b/src/GC/GC_MakeCircle.cdl
index 9df09a7d13756d7c45cbc753e1119047b72607ef..be69272747eb11d27baa3f24f2f67e24c70ac943 100644 (file)
--- a/src/GC/GC_MakeCircle.cdl
+++ b/src/GC/GC_MakeCircle.cdl
@@ -100,11 +100,7 @@ Value(me) returns Circle from Geom
     -- Exceptions
     -- StdFail_NotDone if no circle is constructed.
     ---C++: return const&
-
-Operator(me) returns Circle from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Circle() const;"
+    ---C++: alias "operator const Handle(Geom_Circle)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeCircle.cxx b/src/GC/GC_MakeCircle.cxx
index 3caac6715f4b4863ca0888f21dee5c36eae133e1..387301140b065ccc916efeb109838e5729adf3ff 100644 (file)
--- a/src/GC/GC_MakeCircle.cxx
+++ b/src/GC/GC_MakeCircle.cxx
@@ -100,14 +100,3 @@ const Handle(Geom_Circle)& GC_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom_Circle)& GC_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCircle::operator Handle(Geom_Circle) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeConicalSurface.cdl b/src/GC/GC_MakeConicalSurface.cdl
index 9c36ddecfb93e1be83664769a41db39a85965fb0..2ec60e31c82e5e0d9d5861e75ac3d6a2301a2a2d 100644 (file)
--- a/src/GC/GC_MakeConicalSurface.cdl
+++ b/src/GC/GC_MakeConicalSurface.cdl
@@ -128,11 +128,7 @@ Value(me) returns ConicalSurface from Geom
        -- Exceptions
        -- StdFail_NotDone if no cone is constructed.
        ---C++: return const&
-
-Operator(me) returns ConicalSurface from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_ConicalSurface() const;"
+        ---C++: alias "operator const Handle(Geom_ConicalSurface)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeConicalSurface.cxx b/src/GC/GC_MakeConicalSurface.cxx
index aa8546c4bcc905e28e0a278fd483e41784513854..2e8d1b6298ef2b087ba0d5d94f2fee006d93fa1a 100644 (file)
--- a/src/GC/GC_MakeConicalSurface.cxx
+++ b/src/GC/GC_MakeConicalSurface.cxx
@@ -108,14 +108,3 @@ const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_ConicalSurface)& GC_MakeConicalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeConicalSurface::operator Handle(Geom_ConicalSurface) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeCylindricalSurface.cdl b/src/GC/GC_MakeCylindricalSurface.cdl
index 725d17ee99f16f61a51cf274915f263170480346..c904422ff3a3a0c3688e1f5486c54698255f8756 100644 (file)
--- a/src/GC/GC_MakeCylindricalSurface.cdl
+++ b/src/GC/GC_MakeCylindricalSurface.cdl
@@ -109,11 +109,7 @@ Value(me) returns CylindricalSurface from Geom
     ---Purpose: Returns the constructed cylinder.
     -- Exceptions StdFail_NotDone if no cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns CylindricalSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_CylindricalSurface() const;"
+    ---C++: alias "operator const Handle(Geom_CylindricalSurface)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeCylindricalSurface.cxx b/src/GC/GC_MakeCylindricalSurface.cxx
index 9d8a9a6177b328e30b3ddcd136548cdbce553382..2e81ad5172c767342453ed4ce04a9e7d45056f9c 100644 (file)
--- a/src/GC/GC_MakeCylindricalSurface.cxx
+++ b/src/GC/GC_MakeCylindricalSurface.cxx
@@ -101,13 +101,3 @@ const Handle(Geom_CylindricalSurface)&
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCylinder;
 }
-
-const Handle(Geom_CylindricalSurface)& GC_MakeCylindricalSurface::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeCylindricalSurface::operator Handle(Geom_CylindricalSurface) () const
-{
-  return Value();
-}

diff --git a/src/GC/GC_MakeEllipse.cdl b/src/GC/GC_MakeEllipse.cdl
index 9f116aeb2a5de5e4f3f83e6d85fe8e173d4a08d1..85e9962d4922a750444fb1ad79a4dc18c575f7a2 100644 (file)
--- a/src/GC/GC_MakeEllipse.cdl
+++ b/src/GC/GC_MakeEllipse.cdl
@@ -72,11 +72,7 @@ Value(me) returns Ellipse from Geom
        ---Purpose: Returns the constructed ellipse.
        -- Exceptions StdFail_NotDone if no ellipse is constructed.
         ---C++: return const&
-
-Operator(me) returns Ellipse from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_Ellipse() const;"
+        ---C++: alias "operator const Handle(Geom_Ellipse)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeEllipse.cxx b/src/GC/GC_MakeEllipse.cxx
index 9e61d842b9079224d92d538075d50e8290fd1979..d73919cddd18faa12f9cd2eea7ee3d3973dc4194 100644 (file)
--- a/src/GC/GC_MakeEllipse.cxx
+++ b/src/GC/GC_MakeEllipse.cxx
@@ -51,14 +51,3 @@ const Handle(Geom_Ellipse)& GC_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom_Ellipse)& GC_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeEllipse::operator Handle(Geom_Ellipse) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeHyperbola.cdl b/src/GC/GC_MakeHyperbola.cdl
index 58e07148a23eff6e4a89aeae2f7c3a3cd185b017..d41db7b7eeba44d2c0b0fd02dcea08be65ffb2d1 100644 (file)
--- a/src/GC/GC_MakeHyperbola.cdl
+++ b/src/GC/GC_MakeHyperbola.cdl
@@ -81,11 +81,7 @@ Value(me) returns Hyperbola from Geom
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions StdFail_NotDone if no hyperbola is constructed.
     ---C++: return const&
-
-Operator(me) returns Hyperbola from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom_Hyperbola)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeHyperbola.cxx b/src/GC/GC_MakeHyperbola.cxx
index d9cb1999e3c3d26c48c1d69c0715e36d7d5de329..7d90a6ccfdda6930f8c03d2cfecb41cb5bc96a73 100644 (file)
--- a/src/GC/GC_MakeHyperbola.cxx
+++ b/src/GC/GC_MakeHyperbola.cxx
@@ -50,14 +50,3 @@ const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom_Hyperbola)& GC_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeHyperbola::operator Handle(Geom_Hyperbola) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeLine.cdl b/src/GC/GC_MakeLine.cdl
index 356b41d5a8b58cfd71b4e858f8b0dbc248499295..78b494f54c3c2fc06d70df5d37ba13c632a2e91f 100644 (file)
--- a/src/GC/GC_MakeLine.cdl
+++ b/src/GC/GC_MakeLine.cdl
@@ -72,11 +72,7 @@ Value(me) returns Line from Geom
     ---Purpose:  Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
     ---C++: return const&
-
-Operator(me) returns Line from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Line() const;"
+    ---C++: alias "operator const Handle(Geom_Line)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeLine.cxx b/src/GC/GC_MakeLine.cxx
index 617f291feaed4c6ae5cbd8f80ce7301c94b93753..0c3756f88588eccae6d1a9444e2ef94e9fe290ea 100644 (file)
--- a/src/GC/GC_MakeLine.cxx
+++ b/src/GC/GC_MakeLine.cxx
@@ -66,14 +66,3 @@ const Handle(Geom_Line)& GC_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom_Line)& GC_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeLine::operator Handle(Geom_Line) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeMirror.cdl b/src/GC/GC_MakeMirror.cdl
index 97ebb463395ecd135946988673be7e27d69dadf9..7cdc997ed207fbc2f55f4daa9b048d3f37f191d6 100644 (file)
--- a/src/GC/GC_MakeMirror.cdl
+++ b/src/GC/GC_MakeMirror.cdl
@@ -61,11 +61,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeMirror.cxx b/src/GC/GC_MakeMirror.cxx
index c5dc1c6d584d3f0ef43621656288c7cef0848fe3..b56d617d56ab173903c7b52473db7df11108d1dc 100644 (file)
--- a/src/GC/GC_MakeMirror.cxx
+++ b/src/GC/GC_MakeMirror.cxx
@@ -80,14 +80,3 @@ const Handle(Geom_Transformation)& GC_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom_Transformation)& GC_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GC_MakeMirror::operator Handle(Geom_Transformation) () const
-{
-  return TheMirror;
-}
-

diff --git a/src/GC/GC_MakePlane.cdl b/src/GC/GC_MakePlane.cdl
index 2bfb8bf4d02f862640c44b7c569f92966504ddb3..ddcaa332b00a59d21571282a4899218a2b93e05b 100644 (file)
--- a/src/GC/GC_MakePlane.cdl
+++ b/src/GC/GC_MakePlane.cdl
@@ -98,11 +98,7 @@ Value(me) returns Plane from Geom
     ---Purpose: Returns the constructed plane.
     -- Exceptions StdFail_NotDone if no plane is constructed.
     ---C++: return const&
-
-Operator(me) returns Plane from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Plane() const;"
+    ---C++: alias "operator const Handle(Geom_Plane)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakePlane.cxx b/src/GC/GC_MakePlane.cxx
index 88232f5a8411126fcec3620b6be6a258cba45be5..ba916f122cc0f5c33dab47a0449e159a530957bf 100644 (file)
--- a/src/GC/GC_MakePlane.cxx
+++ b/src/GC/GC_MakePlane.cxx
@@ -122,14 +122,3 @@ const Handle(Geom_Plane)& GC_MakePlane::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return ThePlane;
 }
-
-const Handle(Geom_Plane)& GC_MakePlane::Operator() const 
-{
-  return Value();
-}
-
-GC_MakePlane::operator Handle(Geom_Plane) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeRotation.cdl b/src/GC/GC_MakeRotation.cdl
index 02d432e645d311bfe7a448bb6ba65f8af4114cad..0439b2f4275ce4b703d94af45ffbd533ea441356 100644 (file)
--- a/src/GC/GC_MakeRotation.cdl
+++ b/src/GC/GC_MakeRotation.cdl
@@ -51,11 +51,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-  
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeRotation.cxx b/src/GC/GC_MakeRotation.cxx
index abdd4a25080329fc956c4e6a4e88317e8e96712b..faf9f43dd0d8449fc7bcee78214d0d362dffc0f6 100644 (file)
--- a/src/GC/GC_MakeRotation.cxx
+++ b/src/GC/GC_MakeRotation.cxx
@@ -56,17 +56,3 @@ const Handle(Geom_Transformation)& GC_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GC_MakeRotation::operator Handle(Geom_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-

diff --git a/src/GC/GC_MakeScale.cdl b/src/GC/GC_MakeScale.cdl
index c27143e590a31656b255322d1ca01cc7e318d80b..f1470f122d08908467d03ca0459255231f328d01 100644 (file)
--- a/src/GC/GC_MakeScale.cdl
+++ b/src/GC/GC_MakeScale.cdl
@@ -43,11 +43,7 @@ Value(me) returns Transformation from Geom
     is static;
     ---Purpose: Returns the constructed transformation.
     ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeScale.cxx b/src/GC/GC_MakeScale.cxx
index c76420f4c00d1f7089af331eba933dde9ff93709..8980106962902539c38eaa58460d57370bb642d8 100644 (file)
--- a/src/GC/GC_MakeScale.cxx
+++ b/src/GC/GC_MakeScale.cxx
@@ -32,14 +32,3 @@ const Handle(Geom_Transformation)& GC_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom_Transformation)& GC_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GC_MakeScale::operator Handle(Geom_Transformation) () const
-{
-  return TheScale;
-}
-

diff --git a/src/GC/GC_MakeSegment.cdl b/src/GC/GC_MakeSegment.cdl
index ca6dcc045668e285b7f1aa6f56a383a6b5d92000..be848124cd0905467e4a043caf495b91a9bf1deb 100644 (file)
--- a/src/GC/GC_MakeSegment.cdl
+++ b/src/GC/GC_MakeSegment.cdl
@@ -64,11 +64,7 @@ Value(me) returns TrimmedCurve from Geom
     is static;
        ---Purpose: Returns the constructed line segment.
        ---C++: return const&
-
-Operator(me) returns TrimmedCurve from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeSegment.cxx b/src/GC/GC_MakeSegment.cxx
index 35589b637beba285be5fe89292f05575f375cff7..e5e6d05e1deb85ce6f9211958feb565d30d70a52 100644 (file)
--- a/src/GC/GC_MakeSegment.cxx
+++ b/src/GC/GC_MakeSegment.cxx
@@ -64,14 +64,3 @@ const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom_TrimmedCurve)& GC_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GC_MakeSegment::operator Handle(Geom_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeTranslation.cdl b/src/GC/GC_MakeTranslation.cdl
index f87647128aebbe02bad90bc7e52fddf285f6e233..55f33e64794daa9afa4f3f4688492499836149eb 100644 (file)
--- a/src/GC/GC_MakeTranslation.cdl
+++ b/src/GC/GC_MakeTranslation.cdl
@@ -44,11 +44,7 @@ Value(me) returns Transformation from Geom
     is static;
        ---Purpose:  Returns the constructed transformation.
        ---C++: return const&
-
-Operator(me) returns Transformation from Geom
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeTranslation.cxx b/src/GC/GC_MakeTranslation.cxx
index 4959b18b955731e7231602a072e27ff2475d3f1a..454814035deceaf47fd7735ec95de5b3b828e30e 100644 (file)
--- a/src/GC/GC_MakeTranslation.cxx
+++ b/src/GC/GC_MakeTranslation.cxx
@@ -42,14 +42,3 @@ const Handle(Geom_Transformation)& GC_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom_Transformation)& GC_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GC_MakeTranslation::operator Handle(Geom_Transformation) () const
-{
-  return TheTranslation;
-}
-

diff --git a/src/GC/GC_MakeTrimmedCone.cdl b/src/GC/GC_MakeTrimmedCone.cdl
index 73bb4cdcd708d5c797ca9cdcda8a92efe07a99c5..e328c30831b2d8dac453bdc8f3ec7c03e56f9f45 100644 (file)
--- a/src/GC/GC_MakeTrimmedCone.cdl
+++ b/src/GC/GC_MakeTrimmedCone.cdl
@@ -71,11 +71,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     ---Purpose: Returns the constructed trimmed cone.
     -- StdFail_NotDone if no trimmed cone is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeTrimmedCone.cxx b/src/GC/GC_MakeTrimmedCone.cxx
index a4beefe72d21cd63cc3c9cd6d3b3ffaf506ff092..e226ff3ddbee78b3f41e88721251a99e8488dc29 100644 (file)
--- a/src/GC/GC_MakeTrimmedCone.cxx
+++ b/src/GC/GC_MakeTrimmedCone.cxx
@@ -76,16 +76,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCone;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCone::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCone::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-

diff --git a/src/GC/GC_MakeTrimmedCylinder.cdl b/src/GC/GC_MakeTrimmedCylinder.cdl
index 1e59fc1aa4774b9869c9c7d6bbd94980262db460..08198897fa53b162a2725ba40e751d2441ef58a0 100644 (file)
--- a/src/GC/GC_MakeTrimmedCylinder.cdl
+++ b/src/GC/GC_MakeTrimmedCylinder.cdl
@@ -93,11 +93,7 @@ Value(me) returns RectangularTrimmedSurface from Geom
     -- Exceptions
     -- StdFail_NotDone if no trimmed cylinder is constructed.
     ---C++: return const&
-
-Operator(me) returns RectangularTrimmedSurface from Geom
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom_RectangularTrimmedSurface() const;"
+    ---C++: alias "operator const Handle(Geom_RectangularTrimmedSurface)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GC/GC_MakeTrimmedCylinder.cxx b/src/GC/GC_MakeTrimmedCylinder.cxx
index 2aac425b11d5843c9b05937617fccc364b396ee0..e918eb49de4dc62dc03e025ee4f848370be6e24a 100644 (file)
--- a/src/GC/GC_MakeTrimmedCylinder.cxx
+++ b/src/GC/GC_MakeTrimmedCylinder.cxx
@@ -18,6 +18,7 @@
 #include <GC_MakeCylindricalSurface.hxx>
 #include <StdFail_NotDone.hxx>
 #include <Standard_NotImplemented.hxx>
+#include <Geom_CylindricalSurface.hxx>
 
 //=========================================================================
 //   Creation of a cylinder limited by three points <P1>, <P2> and <P3>.         +
@@ -85,16 +86,3 @@ const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCyl;
 }
-
-const Handle(Geom_RectangularTrimmedSurface)& GC_MakeTrimmedCylinder::
-       Operator() const 
-{
-  return Value();
-}
-
-GC_MakeTrimmedCylinder::
-  operator Handle(Geom_RectangularTrimmedSurface) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeArcOfCircle.cdl b/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
index 23215acb5e5278abac943de894ba6822763dbee7..17b8598ff2087feab210d365fa0e80028e47e709 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfCircle.cdl
@@ -82,11 +82,7 @@ Value(me) returns TrimmedCurve from Geom2d
        ---C++: return const&
        ---Purpose: Returns the constructed arc of circle.
        -- Exceptions StdFail_NotDone if no arc of circle is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeArcOfCircle.cxx b/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
index 0988646caa8a20c30e822818b0778de1545d4c08..4bf7aa10c65cde24d647718053d1abe914dd8d0d 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfCircle.cxx
@@ -114,14 +114,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfCircle::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl b/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
index 05659882890c147d0a976e4c948d5d3b3c7c2e75..c63daf694fc588f13a5b5508474df265b6d2917c 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfEllipse.cdl
@@ -68,11 +68,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed arc of ellipse.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx b/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
index 07fbd2fcfc61508f39ca1e184a34bcf291c100eb..08a89b7e0e7efe7dba47a15b7b1509bbd5822e2a 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfEllipse.cxx
@@ -57,17 +57,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfEllipse::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-
-
-
-

diff --git a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
index 8b2838b138b8b261f5424a39668578bf17d08a46..ce112a08cfbbb7da62e80129083a4fb79d8fa6c8 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed arc of hyperbola.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
index d981da8a58764ce6f659484667ca9a90f4f64c90..18c383bd66b404f0a447822a1a02492218e0e9c1 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfHyperbola.cxx
@@ -59,14 +59,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfHyperbola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeArcOfParabola.cdl b/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
index b39d734a312849bd67dd1e638c761ec184fd01d9..15627a026abb0f22b7326edce93774495f7b5881 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
+++ b/src/GCE2d/GCE2d_MakeArcOfParabola.cdl
@@ -67,11 +67,7 @@ Value(me) returns TrimmedCurve from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed arc of parabola.
-    
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeArcOfParabola.cxx b/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
index 613e6e2503630f3eb0aafea860c90d70ed9aad43..8e23469d9ea374636f8e5ecd254b928e1e0e473e 100644 (file)
--- a/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
+++ b/src/GCE2d/GCE2d_MakeArcOfParabola.cxx
@@ -58,14 +58,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheArc;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeArcOfParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeArcOfParabola::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeCircle.cdl b/src/GCE2d/GCE2d_MakeCircle.cdl
index f936b45cd9a391fca6dc2e18ef11f15d11beaf4f..ce184ae580aa400eb36a5893c4c58ea043047d42 100644 (file)
--- a/src/GCE2d/GCE2d_MakeCircle.cdl
+++ b/src/GCE2d/GCE2d_MakeCircle.cdl
@@ -104,11 +104,7 @@ Value(me) returns Circle from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed circle.
     -- Exceptions StdFail_NotDone if no circle is constructed.
-
-Operator(me) returns Circle from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Circle() const;"
+    ---C++: alias "operator const Handle(Geom2d_Circle)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeCircle.cxx b/src/GCE2d/GCE2d_MakeCircle.cxx
index d8058e7041c04635ddae47931700401b4c71376b..2da522ad739d59d0c2adbc93516e77469202df42 100644 (file)
--- a/src/GCE2d/GCE2d_MakeCircle.cxx
+++ b/src/GCE2d/GCE2d_MakeCircle.cxx
@@ -103,14 +103,3 @@ const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheCircle;
 }
-
-const Handle(Geom2d_Circle)& GCE2d_MakeCircle::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeCircle::operator Handle(Geom2d_Circle) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeEllipse.cdl b/src/GCE2d/GCE2d_MakeEllipse.cdl
index 7db14ad90ba2dca2f95c46fc8c5b8af7d86a4a9a..965cfaef94593f26d816eb94a69d3ee9af1f6f85 100644 (file)
--- a/src/GCE2d/GCE2d_MakeEllipse.cdl
+++ b/src/GCE2d/GCE2d_MakeEllipse.cdl
@@ -86,11 +86,7 @@ Value(me) returns Ellipse from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed ellipse.
     -- Exceptions StdFail_NotDone if no ellipse is constructed.
-    
-Operator(me) returns Ellipse from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Ellipse() const;"
+    ---C++: alias "operator const Handle(Geom2d_Ellipse)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeEllipse.cxx b/src/GCE2d/GCE2d_MakeEllipse.cxx
index 4800102d7493cf499ecba0efc1a1e0e96579a742..29dccf8a47080608f916f1d109f08dbe00dbff4a 100644 (file)
--- a/src/GCE2d/GCE2d_MakeEllipse.cxx
+++ b/src/GCE2d/GCE2d_MakeEllipse.cxx
@@ -62,14 +62,3 @@ const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheEllipse;
 }
-
-const Handle(Geom2d_Ellipse)& GCE2d_MakeEllipse::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeEllipse::operator Handle(Geom2d_Ellipse) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeHyperbola.cdl b/src/GCE2d/GCE2d_MakeHyperbola.cdl
index cf7cb9c402523ee11db3e77e8cc70fe7e0ba848a..578a35260de5286add556358d52b32099758f66d 100644 (file)
--- a/src/GCE2d/GCE2d_MakeHyperbola.cdl
+++ b/src/GCE2d/GCE2d_MakeHyperbola.cdl
@@ -106,11 +106,7 @@ Value(me) returns Hyperbola from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed hyperbola.
     -- Exceptions: StdFail_NotDone if no hyperbola is constructed.
-    
-Operator(me) returns Hyperbola from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Hyperbola() const;"
+    ---C++: alias "operator const Handle(Geom2d_Hyperbola)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeHyperbola.cxx b/src/GCE2d/GCE2d_MakeHyperbola.cxx
index 714edf30eec8fe8f2c3fb3af8c873b88e14dddf8..377c53afbcdd2f76772d317d605ee3222a6e6a0f 100644 (file)
--- a/src/GCE2d/GCE2d_MakeHyperbola.cxx
+++ b/src/GCE2d/GCE2d_MakeHyperbola.cxx
@@ -62,14 +62,3 @@ const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheHyperbola;
 }
-
-const Handle(Geom2d_Hyperbola)& GCE2d_MakeHyperbola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeHyperbola::operator Handle(Geom2d_Hyperbola) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeLine.cdl b/src/GCE2d/GCE2d_MakeLine.cdl
index 0b59b541e7d3ce907d1316968748b4a4b4fde7b6..61cc414d44c213fac6da7608d7f2778c837bac4e 100644 (file)
--- a/src/GCE2d/GCE2d_MakeLine.cdl
+++ b/src/GCE2d/GCE2d_MakeLine.cdl
@@ -72,11 +72,7 @@ Value(me) returns Line from Geom2d
     ---C++: return const&
     ---Purpose: Returns the constructed line.
     -- Exceptions StdFail_NotDone if no line is constructed.
-
-Operator(me) returns Line from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Line() const;"
+    ---C++: alias "operator const Handle(Geom2d_Line)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeLine.cxx b/src/GCE2d/GCE2d_MakeLine.cxx
index a3122da17e907352c722383a32fa913c93aafabd..2a4aadd632dc6ca4b15e1cdebbac29f81c49bda3 100644 (file)
--- a/src/GCE2d/GCE2d_MakeLine.cxx
+++ b/src/GCE2d/GCE2d_MakeLine.cxx
@@ -76,14 +76,3 @@ const Handle(Geom2d_Line)& GCE2d_MakeLine::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheLine;
 }
-
-const Handle(Geom2d_Line) & GCE2d_MakeLine::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeLine::operator Handle(Geom2d_Line) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeMirror.cdl b/src/GCE2d/GCE2d_MakeMirror.cdl
index 54875dad101432e3f7d6520bd1def74451f093d3..bbb724f37be33ad71bcbb9083b95e80dbf98e1cb 100644 (file)
--- a/src/GCE2d/GCE2d_MakeMirror.cdl
+++ b/src/GCE2d/GCE2d_MakeMirror.cdl
@@ -53,11 +53,7 @@ Value(me) returns Transformation from Geom2d
     is static;
     ---C++: return const&
     ---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-    ---C++: return const&
-    ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+    ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeMirror.cxx b/src/GCE2d/GCE2d_MakeMirror.cxx
index 5b4e876f80d3037b5ca607b585cf598efa66080a..bf70a677e388e620c68cf81fd904578ab40e4c7f 100644 (file)
--- a/src/GCE2d/GCE2d_MakeMirror.cxx
+++ b/src/GCE2d/GCE2d_MakeMirror.cxx
@@ -58,14 +58,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Value() const
 { 
   return TheMirror;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeMirror::Operator() const 
-{
-  return TheMirror;
-}
-
-GCE2d_MakeMirror::operator Handle(Geom2d_Transformation) () const
-{
-  return TheMirror;
-}
-

diff --git a/src/GCE2d/GCE2d_MakeParabola.cdl b/src/GCE2d/GCE2d_MakeParabola.cdl
index 9f1950f2fcf92fda149ec959a38c464cf579022c..91e99f84580c3bfa0e0b879a232f19e141f21386 100644 (file)
--- a/src/GCE2d/GCE2d_MakeParabola.cdl
+++ b/src/GCE2d/GCE2d_MakeParabola.cdl
@@ -102,11 +102,7 @@ Value(me) returns Parabola from Geom2d
        ---C++: return const&
        ---Purpose: Returns the constructed parabola.
        -- Exceptions StdFail_NotDone if no parabola is constructed.
-    
-Operator(me) returns Parabola from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Parabola() const;"
+        ---C++: alias "operator const Handle(Geom2d_Parabola)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeParabola.cxx b/src/GCE2d/GCE2d_MakeParabola.cxx
index 381ee1f6802cbeaf24f11fd1bc0a2555c0b9bc8a..529417db4a7887b53d50493a6f3213268f6d1371 100644 (file)
--- a/src/GCE2d/GCE2d_MakeParabola.cxx
+++ b/src/GCE2d/GCE2d_MakeParabola.cxx
@@ -77,14 +77,3 @@ const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheParabola;
 }
-
-const Handle(Geom2d_Parabola)& GCE2d_MakeParabola::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeParabola::operator Handle(Geom2d_Parabola) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeRotation.cdl b/src/GCE2d/GCE2d_MakeRotation.cdl
index d998b1ca5c135a84dfeeb509a1b8859dac157873..f2f8e8d20cf62f84b1857ab47352e5a03e5c68f2 100644 (file)
--- a/src/GCE2d/GCE2d_MakeRotation.cdl
+++ b/src/GCE2d/GCE2d_MakeRotation.cdl
@@ -39,11 +39,7 @@ Value(me) returns Transformation from Geom2d
     is static;
        ---C++: return const&
        ---Purpose:  Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeRotation.cxx b/src/GCE2d/GCE2d_MakeRotation.cxx
index dfd92761ef308de3bc2e266502944136a8df2369..5990d352b6f818d23a45ec3c17f672d2b886e03c 100644 (file)
--- a/src/GCE2d/GCE2d_MakeRotation.cxx
+++ b/src/GCE2d/GCE2d_MakeRotation.cxx
@@ -31,17 +31,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Value() const
 { 
   return TheRotation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeRotation::Operator() const 
-{
-  return TheRotation;
-}
-
-GCE2d_MakeRotation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheRotation;
-}
-
-
-
-

diff --git a/src/GCE2d/GCE2d_MakeScale.cdl b/src/GCE2d/GCE2d_MakeScale.cdl
index 951dd403f850e1fedd05e3d59f35f45ea8ca4ce9..f2639ea969847553bcd0cf9a3d21bef679bf6bac 100644 (file)
--- a/src/GCE2d/GCE2d_MakeScale.cdl
+++ b/src/GCE2d/GCE2d_MakeScale.cdl
@@ -42,11 +42,7 @@ Value(me) returns Transformation from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed transformation.
-
-Operator(me) returns Transformation from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeScale.cxx b/src/GCE2d/GCE2d_MakeScale.cxx
index b44cb5faecc52f01b780f233d5ab4c0f3d9a2362..0cfb2637c585df9e937c466e7e5d5886e7525ca8 100644 (file)
--- a/src/GCE2d/GCE2d_MakeScale.cxx
+++ b/src/GCE2d/GCE2d_MakeScale.cxx
@@ -30,14 +30,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Value() const
 { 
   return TheScale;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeScale::Operator() const 
-{
-  return TheScale;
-}
-
-GCE2d_MakeScale::operator Handle(Geom2d_Transformation) () const
-{
-  return TheScale;
-}
-

diff --git a/src/GCE2d/GCE2d_MakeSegment.cdl b/src/GCE2d/GCE2d_MakeSegment.cdl
index 755ce7c2ffc109c36bbf2cd8e679a1b23b05eba5..6b783ce076c6dae0d72bebd3cb75ad4678b70e13 100644 (file)
--- a/src/GCE2d/GCE2d_MakeSegment.cdl
+++ b/src/GCE2d/GCE2d_MakeSegment.cdl
@@ -80,11 +80,7 @@ Value(me) returns TrimmedCurve from Geom2d
        ---C++: return const&
        ---Purpose: Returns the constructed line segment.
        -- Exceptions StdFail_NotDone if no line segment is constructed.
-
-Operator(me) returns TrimmedCurve from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_TrimmedCurve() const;"
+        ---C++: alias "operator const Handle(Geom2d_TrimmedCurve)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeSegment.cxx b/src/GCE2d/GCE2d_MakeSegment.cxx
index 406017816b7f9e145edee5750f3f65c8ce4f2258..06de6232c3a03052ba19561b69da91d7e68bf823 100644 (file)
--- a/src/GCE2d/GCE2d_MakeSegment.cxx
+++ b/src/GCE2d/GCE2d_MakeSegment.cxx
@@ -80,14 +80,3 @@ const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Value() const
   StdFail_NotDone_Raise_if(TheError != gce_Done,"");
   return TheSegment;
 }
-
-const Handle(Geom2d_TrimmedCurve)& GCE2d_MakeSegment::Operator() const 
-{
-  return Value();
-}
-
-GCE2d_MakeSegment::operator Handle(Geom2d_TrimmedCurve) () const
-{
-  return Value();
-}
-

diff --git a/src/GCE2d/GCE2d_MakeTranslation.cdl b/src/GCE2d/GCE2d_MakeTranslation.cdl
index 18adcf4f12a69a4f77d3ad850c7792d71497e22a..5f722f9561743c337e24cd513d4dd7a4d158e40c 100644 (file)
--- a/src/GCE2d/GCE2d_MakeTranslation.cdl
+++ b/src/GCE2d/GCE2d_MakeTranslation.cdl
@@ -45,11 +45,7 @@ Value(me) returns Transformation from Geom2d
     is static;
        ---C++: return const&
        ---Purpose: Returns the constructed transformation.
-    
-Operator(me) returns Transformation from Geom2d
-    is static;
-       ---C++: return const&
-       ---C++: alias "Standard_EXPORT operator Handle_Geom2d_Transformation() const;"
+        ---C++: alias "operator const Handle(Geom2d_Transformation)& () const { return Value(); }"
 
 fields
 

diff --git a/src/GCE2d/GCE2d_MakeTranslation.cxx b/src/GCE2d/GCE2d_MakeTranslation.cxx
index 0413d621ca441555c18a1167a9cf059c5cba0e4c..f46d4ed6381dce3ca700a7e091d092f82b533bc9 100644 (file)
--- a/src/GCE2d/GCE2d_MakeTranslation.cxx
+++ b/src/GCE2d/GCE2d_MakeTranslation.cxx
@@ -40,14 +40,3 @@ const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Value() const
 { 
   return TheTranslation;
 }
-
-const Handle(Geom2d_Transformation)& GCE2d_MakeTranslation::Operator() const 
-{
-  return TheTranslation;
-}
-
-GCE2d_MakeTranslation::operator Handle(Geom2d_Transformation) () const
-{
-  return TheTranslation;
-}
-