0025324: Make OCCT collections copy-constructible

Since TCollection package is going to be obsolete we change only classes that are currently needed to have copy constructor.

diff --git a/src/TColStd/TColStd_PackedMapOfInteger.hxx b/src/TColStd/TColStd_PackedMapOfInteger.hxx
index 47b4f807baabb3d3642145f96561e3b95a43873d..a0dd633a353730efd070238798c1bf35976a941c 100644 (file)
--- a/src/TColStd/TColStd_PackedMapOfInteger.hxx
+++ b/src/TColStd/TColStd_PackedMapOfInteger.hxx
@@ -37,6 +37,12 @@ class TColStd_PackedMapOfInteger : private TCollection_BasicMap
     : TCollection_BasicMap (NbBuckets, Standard_True),
       myExtent             (0) {}
 
+  /// Copy constructor
+  inline TColStd_PackedMapOfInteger (const TColStd_PackedMapOfInteger& theOther)
+    : TCollection_BasicMap (1, Standard_True),
+      myExtent             (0)
+  { Assign(theOther); }
+
   inline TColStd_PackedMapOfInteger&
                           operator =  (const TColStd_PackedMapOfInteger& Other) 
   { return Assign(Other); }
@@ -210,11 +216,6 @@ public:
 
 
  private:
-  // ----------- PRIVATE (PROHIBITED) methods
-  /// Copy constructor - prohibited.
-  TColStd_PackedMapOfInteger (const TColStd_PackedMapOfInteger& theOther);
-
-
   // ---------- PRIVATE FIELDS ----------
 
   size_t                myExtent;

diff --git a/src/TCollection/TCollection_Sequence.cdl b/src/TCollection/TCollection_Sequence.cdl
index c06c9524cbcdf0ce47293ff5b1626fa98b77332c..b7a6d2f9633ee49da1b2bb925307aa3fc418976c 100644 (file)
--- a/src/TCollection/TCollection_Sequence.cdl
+++ b/src/TCollection/TCollection_Sequence.cdl
@@ -70,11 +70,8 @@ is
                -- assignment operator (operator=).
                ---C++: inline
 
-       Create(Other : Sequence) returns Sequence from TCollection
+       Create(Other : Sequence) returns Sequence from TCollection;
                ---Purpose: Creation by copy of existing Sequence.
-               --  Warning: This constructor prints a warning message.
-               -- We recommand to use the operator =.
-       is private;
                
        Clear(me : in out);
                ---Purpose: Removes all element(s) of the sequence <me>

diff --git a/src/TCollection/TCollection_Sequence.lxx b/src/TCollection/TCollection_Sequence.lxx
index ac8a0bedee947d90cf279705103f9ce99df0a8ab..3b060fdeb318076c53d82905269d14c07e5cc8eb 100644 (file)
--- a/src/TCollection/TCollection_Sequence.lxx
+++ b/src/TCollection/TCollection_Sequence.lxx
@@ -23,6 +23,16 @@ inline TCollection_Sequence::TCollection_Sequence()
 {
 }
 
+//=======================================================================
+//function : Copy constructor
+//purpose  : 
+//=======================================================================
+
+inline TCollection_Sequence::TCollection_Sequence(const TCollection_Sequence& theOther)
+{
+  Assign(theOther);
+}
+
 //=======================================================================
 //function : Append 
 //purpose  : Appends a Sequence to myself