0025617: Avoid classes with a copy constructor and the default destructor or assignme...

Removed useless user-defined copy constructors and assignment operators in BOPCol_NCVector, NCollection_Mat4, NCollection_Vec*

User-defined assignment operator matching copy constructor added in NCollection_StdAllocator.

Class VrmlData_DataMapOfShapeAppearance redefined as simple typedef to NCollection_DataMap<>.

diff --git a/src/BOPCol/BOPCol_NCVector.hxx b/src/BOPCol/BOPCol_NCVector.hxx
index 73ad5e4a3788af934847927a06285c45c39a7f15..f3db4b59028a5f91b655571836e7ae202269c494 100755 (executable)
--- a/src/BOPCol/BOPCol_NCVector.hxx
+++ b/src/BOPCol/BOPCol_NCVector.hxx
@@ -33,10 +33,6 @@ template <class Type> class BOPCol_NCVector
     : NCollection_Vector<Type>(theIncrement, theAlloc)
   {}
   //
-  BOPCol_NCVector(const BOPCol_NCVector& theOther) 
-    : NCollection_Vector<Type>(theOther)
-  {}
-  //
   Type& Append1 ()
   {
     Type& anAppended = *(Type*)this->expandV (this->myLength);

diff --git a/src/NCollection/NCollection_Mat4.hxx b/src/NCollection/NCollection_Mat4.hxx
index c2d52cd9052e8f6221c747b06673b1ec07e0ce6d..9481fcf72cda54147b2ae2e8ba414b5bb2b98fe7 100755 (executable)
--- a/src/NCollection/NCollection_Mat4.hxx
+++ b/src/NCollection/NCollection_Mat4.hxx
@@ -49,21 +49,6 @@ public:
     InitIdentity();
   }
 
-  //! Copy constructor.
-  //! @param theOther [in] the matrix to copy values from.
-  NCollection_Mat4 (const NCollection_Mat4& theOther)
-  {
-    std::memcpy (this, &theOther, sizeof (NCollection_Mat4));
-  }
-
-  //! Assignment operator.
-  //! @param theOther [in] the matrix to copy values from.
-  const NCollection_Mat4& operator= (const NCollection_Mat4& theOther)
-  {
-    std::memcpy (this, &theOther, sizeof (NCollection_Mat4));
-    return *this;
-  }
-
   //! Get element at the specified row and column.
   //! @param theRow [in] the row.to address.
   //! @param theCol [in] the column to address.

diff --git a/src/NCollection/NCollection_StdAllocator.hxx b/src/NCollection/NCollection_StdAllocator.hxx
index 8bf3610504024e41744de5ddc576c35c2f466d45..6b8c9c198e9efed6434c7f0c7144f436929645e5 100755 (executable)
--- a/src/NCollection/NCollection_StdAllocator.hxx
+++ b/src/NCollection/NCollection_StdAllocator.hxx
@@ -58,19 +58,15 @@ public:
   NCollection_StdAllocator( const Handle(NCollection_BaseAllocator)& theAlloc) throw()
   { myAlloc = theAlloc; }
 
-  //! Constructor.
-  /*! Copies Allocator() from \a X.*/
-  NCollection_StdAllocator( const NCollection_StdAllocator& X) throw() { myAlloc = X.myAlloc; }
-
-  //! Destructor.
-  /*! Empty implementation.*/
-  ~NCollection_StdAllocator() throw() {}
-
-  //! Constructor.
+  //! Copy constructor.
   /*! Copies Allocator() from \a Y.*/
   template<typename U> NCollection_StdAllocator( const NCollection_StdAllocator<U>& Y) throw()
   { myAlloc = Y.Allocator(); }
 
+  //! Assignment operator
+  template<typename U> NCollection_StdAllocator& operator= (const NCollection_StdAllocator<U>& Y) throw()
+  { myAlloc = Y.Allocator(); return *this; }
+
   //! Returns an object address.
   /*! Returns &x.*/
   pointer address( reference x ) const { return &x; }
@@ -158,6 +154,13 @@ public:
   /*! Returns an object specified in the constructor.*/
   const Handle(NCollection_BaseAllocator)& Allocator() const { return myAlloc; }
 
+  //! Assignment operator
+  NCollection_StdAllocator& operator=(const NCollection_StdAllocator& X) throw()
+  {
+    myAlloc = X.myAlloc;
+    return *this;
+  }
+
 protected:
   Handle(NCollection_BaseAllocator) myAlloc;
 };

diff --git a/src/NCollection/NCollection_Vec2.hxx b/src/NCollection/NCollection_Vec2.hxx
index 5515a637a1acdb001399784ca77730c70ee0804b..79b95123bc198da60e2621ae1d8865b5deeefed8 100644 (file)
--- a/src/NCollection/NCollection_Vec2.hxx
+++ b/src/NCollection/NCollection_Vec2.hxx
@@ -57,21 +57,6 @@ public:
     v[1] = theY;
   }
 
-  //! Copy constructor.
-  NCollection_Vec2 (const NCollection_Vec2& theVec2)
-  {
-    v[0] = theVec2[0];
-    v[1] = theVec2[1];
-  }
-
-  //! Assignment operator.
-  const NCollection_Vec2& operator= (const NCollection_Vec2& theVec2)
-  {
-    v[0] = theVec2[0];
-    v[1] = theVec2[1];
-    return *this;
-  }
-
   //! Alias to 1st component as X coordinate in XY.
   Element_t x() const { return v[0]; }
 

diff --git a/src/NCollection/NCollection_Vec3.hxx b/src/NCollection/NCollection_Vec3.hxx
index a666aa243bdd534cc36834b1bd5633bbb2e13f25..73b97433689712512b8da9dc8b043ff882498b92 100644 (file)
--- a/src/NCollection/NCollection_Vec3.hxx
+++ b/src/NCollection/NCollection_Vec3.hxx
@@ -73,19 +73,6 @@ public:
     v[2] = Element_t(0);
   }
 
-  //! Copy constructor.
-  NCollection_Vec3 (const NCollection_Vec3& theVec3)
-  {
-    std::memcpy (this, &theVec3, sizeof(NCollection_Vec3));
-  }
-
-  //! Assignment operator.
-  const NCollection_Vec3& operator= (const NCollection_Vec3& theVec3)
-  {
-    std::memcpy (this, &theVec3, sizeof(NCollection_Vec3));
-    return *this;
-  }
-
   //! Alias to 1st component as X coordinate in XYZ.
   Element_t x() const { return v[0]; }
 

diff --git a/src/NCollection/NCollection_Vec4.hxx b/src/NCollection/NCollection_Vec4.hxx
index 65b38ebf151b3039304cb07b75beea3b2640520c..e3016813e68d0c6fd0e2ca8b11871b624f70e341 100644 (file)
--- a/src/NCollection/NCollection_Vec4.hxx
+++ b/src/NCollection/NCollection_Vec4.hxx
@@ -80,19 +80,6 @@ public:
     v[3] = theAlpha;
   }
 
-  //! Copy constructor.
-  NCollection_Vec4 (const NCollection_Vec4& theVec4)
-  {
-    std::memcpy (this, &theVec4, sizeof(NCollection_Vec4));
-  }
-
-  //! Assignment operator.
-  const NCollection_Vec4& operator= (const NCollection_Vec4& theVec4)
-  {
-    std::memcpy (this, &theVec4, sizeof(NCollection_Vec4));
-    return *this;
-  }
-
   //! Alias to 1st component as X coordinate in XYZW.
   Element_t x() const { return v[0]; }
 

diff --git a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
index c0613fdae860f8b60a796873aea829300c88e5ec..b3b5ba34861115945bd229a2ead641052021ba34 100644 (file)
--- a/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
+++ b/src/VrmlData/VrmlData_DataMapOfShapeAppearance.hxx
@@ -20,44 +20,6 @@
 #include <VrmlData_Appearance.hxx>
 #include <TopoDS_TShape.hxx>
 
-/**
- * Data Map that provides the link between each Shape obtained in VRML import
- * and the corresponding Appearance.
- */
-class VrmlData_DataMapOfShapeAppearance
-  : public NCollection_DataMap<Handle(TopoDS_TShape), Handle(VrmlData_Appearance)>
-{
-public:
-  //! Constructor
-  inline VrmlData_DataMapOfShapeAppearance
-                (const Standard_Integer                   NbBuckets=1,
-                 const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
-    :  NCollection_DataMap<Handle(TopoDS_TShape),
-                           Handle(VrmlData_Appearance)> (NbBuckets, theAllocator)
-  {}
-
-  //! Copy constructor
-  inline VrmlData_DataMapOfShapeAppearance
-                (const VrmlData_DataMapOfShapeAppearance& theOther)
-    :  NCollection_DataMap<Handle(TopoDS_TShape),
-                           Handle(VrmlData_Appearance)> (theOther)
-  {}
-  
-  
-  friend Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one,
-                                   const Handle(TopoDS_TShape)& two);
-
-};
-
-//=======================================================================
-//function : IsEqual
-//purpose  : for NCollection_DataMap interface
-//=======================================================================
-inline Standard_Boolean IsEqual (const Handle(TopoDS_TShape)& one,
-                                 const Handle(TopoDS_TShape)& two) 
-{
-  return one == two;
-}
-
+typedef NCollection_DataMap<Handle(TopoDS_TShape), Handle(VrmlData_Appearance)> VrmlData_DataMapOfShapeAppearance;
 
 #endif

diff --git a/src/VrmlData/VrmlData_Group.hxx b/src/VrmlData/VrmlData_Group.hxx
index 2f13bd194f1905229327d76d45cd90f37bb508e5..4de9d470af925c1382001dacc182780a794266d4 100644 (file)
--- a/src/VrmlData/VrmlData_Group.hxx
+++ b/src/VrmlData/VrmlData_Group.hxx
@@ -17,11 +17,11 @@
 #define VrmlData_Group_HeaderFile
 
 #include <VrmlData_ListOfNode.hxx>
+#include <VrmlData_DataMapOfShapeAppearance.hxx>
 #include <Bnd_B3f.hxx>
 #include <gp_Trsf.hxx>
 
 class TopoDS_Shape;
-class VrmlData_DataMapOfShapeAppearance;
 
 /**
  * Implementation of node "Group"

diff --git a/src/VrmlData/VrmlData_Scene.hxx b/src/VrmlData/VrmlData_Scene.hxx
index 6dbde261cbea90020b02e73f06e9b038b57f56d0..052be359dec782a2ffbc931ef7de7a1bce7dfe27 100644 (file)
--- a/src/VrmlData/VrmlData_Scene.hxx
+++ b/src/VrmlData/VrmlData_Scene.hxx
@@ -27,9 +27,9 @@
 #include <TCollection_ExtendedString.hxx>
 #include <NCollection_IncAllocator.hxx>
 #include <Standard_Mutex.hxx>
+#include <VrmlData_DataMapOfShapeAppearance.hxx>
 
 struct VrmlData_InBuffer;
-class VrmlData_DataMapOfShapeAppearance;
 
 /**
  * Block of comments describing class VrmlData_Scene