0029299: Foundation Classes, NCollection - define explicit empty constructor for...

Ambiguous constructors have been marked with explicit keyword for classes
NCollection_DataMap, NCollection_DoubleMap, NCollection_IndexedDataMap, NCollection_IndexedMap,
NCollection_List, NCollection_LocalArray, NCollection_Map, NCollection_Sequence,
NCollection_SparseArray, NCollection_UBTree,

diff --git a/src/NCollection/NCollection_DataMap.hxx b/src/NCollection/NCollection_DataMap.hxx
index 2f9363677d3b59c14c3e428574727e74867696da..779bdecea69204b990fb1956a15f1b24b2c785f1 100644 (file)
--- a/src/NCollection/NCollection_DataMap.hxx
+++ b/src/NCollection/NCollection_DataMap.hxx
@@ -140,10 +140,13 @@ public:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty Constructor.
+  NCollection_DataMap() : NCollection_BaseMap (1, Standard_True, Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_DataMap (const Standard_Integer NbBuckets=1,
-                     const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
-    : NCollection_BaseMap (NbBuckets, Standard_True, theAllocator) {}
+  explicit NCollection_DataMap (const Standard_Integer theNbBuckets,
+                                const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
+  : NCollection_BaseMap (theNbBuckets, Standard_True, theAllocator) {}
 
   //! Copy constructor
   NCollection_DataMap (const NCollection_DataMap& theOther)

diff --git a/src/NCollection/NCollection_DoubleMap.hxx b/src/NCollection/NCollection_DoubleMap.hxx
index 3f67d426d6d280280484ddfe155d28cfdf083023..5f1743423e4eaee68fe3cedd9abffa429d0ea059 100644 (file)
--- a/src/NCollection/NCollection_DoubleMap.hxx
+++ b/src/NCollection/NCollection_DoubleMap.hxx
@@ -123,10 +123,13 @@ public:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_DoubleMap() : NCollection_BaseMap (1, Standard_False, Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_DoubleMap (const Standard_Integer NbBuckets=1,
-                     const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
-    : NCollection_BaseMap (NbBuckets, Standard_False, theAllocator) {}
+  explicit NCollection_DoubleMap (const Standard_Integer theNbBuckets,
+                                  const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
+  : NCollection_BaseMap (theNbBuckets, Standard_False, theAllocator) {}
 
   //! Copy constructor
   NCollection_DoubleMap (const NCollection_DoubleMap& theOther)

diff --git a/src/NCollection/NCollection_IndexedDataMap.hxx b/src/NCollection/NCollection_IndexedDataMap.hxx
index da2c6856f1df67c3b33d119f103df8ba1da9c3a5..45fa17dc011ac05c2ca78f26a74ecb8c99a71acb 100644 (file)
--- a/src/NCollection/NCollection_IndexedDataMap.hxx
+++ b/src/NCollection/NCollection_IndexedDataMap.hxx
@@ -162,10 +162,13 @@ private:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_IndexedDataMap() : NCollection_BaseMap (1, Standard_False, Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_IndexedDataMap (const Standard_Integer NbBuckets=1,
-                     const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
-    :  NCollection_BaseMap (NbBuckets, Standard_False, theAllocator) {}
+  explicit NCollection_IndexedDataMap (const Standard_Integer theNbBuckets,
+                                       const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
+  : NCollection_BaseMap (theNbBuckets, Standard_False, theAllocator) {}
 
   //! Copy constructor
   NCollection_IndexedDataMap (const NCollection_IndexedDataMap& theOther) 

diff --git a/src/NCollection/NCollection_IndexedMap.hxx b/src/NCollection/NCollection_IndexedMap.hxx
index fe3c4a7f773332a956776ee18c4beb9a8004f16a..c0a66cd4e047b036e8a90370e1dccf0584c4a176 100644 (file)
--- a/src/NCollection/NCollection_IndexedMap.hxx
+++ b/src/NCollection/NCollection_IndexedMap.hxx
@@ -124,10 +124,13 @@ private:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_IndexedMap() : NCollection_BaseMap (1, Standard_False, Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_IndexedMap (const Standard_Integer NbBuckets=1,
-                          const Handle(NCollection_BaseAllocator)& theAllocator=0L)
-  : NCollection_BaseMap (NbBuckets, Standard_False, theAllocator) {}
+  explicit NCollection_IndexedMap (const Standard_Integer theNbBuckets,
+                                   const Handle(NCollection_BaseAllocator)& theAllocator=0L)
+  : NCollection_BaseMap (theNbBuckets, Standard_False, theAllocator) {}
 
   //! Copy constructor
   NCollection_IndexedMap (const NCollection_IndexedMap& theOther)

diff --git a/src/NCollection/NCollection_List.hxx b/src/NCollection/NCollection_List.hxx
index ded27c56d968e5df8a874f8eaf18f02f9e3f4735..7ce1eaa1ed58c0f9e20d63903bbeb3a2d16b20e9 100644 (file)
--- a/src/NCollection/NCollection_List.hxx
+++ b/src/NCollection/NCollection_List.hxx
@@ -58,9 +58,11 @@ public:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_List() : NCollection_BaseList(Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_List(const Handle(NCollection_BaseAllocator)& theAllocator=0L) :
-    NCollection_BaseList(theAllocator) {}
+  explicit NCollection_List(const Handle(NCollection_BaseAllocator)& theAllocator) : NCollection_BaseList(theAllocator) {}
 
   //! Copy constructor
   NCollection_List (const NCollection_List& theOther) :

diff --git a/src/NCollection/NCollection_LocalArray.hxx b/src/NCollection/NCollection_LocalArray.hxx
index 20580cc31cf102522574aee3ce67919d8837a175..06050493f729888137f4e3570e850a9c3b7a20b6 100644 (file)
--- a/src/NCollection/NCollection_LocalArray.hxx
+++ b/src/NCollection/NCollection_LocalArray.hxx
@@ -24,7 +24,7 @@ template<class theItem, Standard_Integer MAX_ARRAY_SIZE = 1024> class NCollectio
 {
 public:
 
-  NCollection_LocalArray (const size_t theSize)
+  explicit NCollection_LocalArray (const size_t theSize)
   : myPtr (myBuffer)
   {
     Allocate(theSize);

diff --git a/src/NCollection/NCollection_Map.hxx b/src/NCollection/NCollection_Map.hxx
index 6e12dd8750d8359d25e01ac50a861a0f145914a1..459c4f2c7d60d53e0ff146892f435edf46577644 100644 (file)
--- a/src/NCollection/NCollection_Map.hxx
+++ b/src/NCollection/NCollection_Map.hxx
@@ -119,10 +119,13 @@ public:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_Map() : NCollection_BaseMap (1, Standard_True, Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_Map (const Standard_Integer NbBuckets = 1,
-                   const Handle(NCollection_BaseAllocator)& theAllocator = 0L) :
-    NCollection_BaseMap (NbBuckets, Standard_True, theAllocator) {}
+  explicit NCollection_Map (const Standard_Integer theNbBuckets,
+                            const Handle(NCollection_BaseAllocator)& theAllocator = 0L)
+  : NCollection_BaseMap (theNbBuckets, Standard_True, theAllocator) {}
 
   //! Copy constructor
   NCollection_Map (const NCollection_Map& theOther) :

diff --git a/src/NCollection/NCollection_Sequence.hxx b/src/NCollection/NCollection_Sequence.hxx
index f50896cf022fe16459314d26fae9b0636137b509..1162164bb660ebada635e0aebf59dc9df5b6a23d 100644 (file)
--- a/src/NCollection/NCollection_Sequence.hxx
+++ b/src/NCollection/NCollection_Sequence.hxx
@@ -108,9 +108,11 @@ public:
  public:
   // ---------- PUBLIC METHODS ------------
 
+  //! Empty constructor.
+  NCollection_Sequence() : NCollection_BaseSequence(Handle(NCollection_BaseAllocator)()) {}
+
   //! Constructor
-  NCollection_Sequence(const Handle(NCollection_BaseAllocator)& theAllocator=0L) :
-    NCollection_BaseSequence(theAllocator) {}
+  explicit NCollection_Sequence (const Handle(NCollection_BaseAllocator)& theAllocator) : NCollection_BaseSequence(theAllocator) {}
 
   //! Copy constructor
   NCollection_Sequence (const NCollection_Sequence& theOther) :

diff --git a/src/NCollection/NCollection_SparseArray.hxx b/src/NCollection/NCollection_SparseArray.hxx
index 2d50b4925c7a5df2f38197bfc270c52e63a422df..ade83bceb6aef6d979a3073109a5c65328af29b0 100644 (file)
--- a/src/NCollection/NCollection_SparseArray.hxx
+++ b/src/NCollection/NCollection_SparseArray.hxx
@@ -49,7 +49,7 @@ template <class TheItemType> class NCollection_SparseArray
 public:
 
   //! Constructor; accepts size of blocks 
-  NCollection_SparseArray (Standard_Size theIncrement)
+  explicit NCollection_SparseArray (Standard_Size theIncrement)
     : NCollection_SparseArrayBase(sizeof(TheItemType),theIncrement)
   { 
   }

diff --git a/src/NCollection/NCollection_UBTree.hxx b/src/NCollection/NCollection_UBTree.hxx
index f8c12d0ed077f3fd1eda2b7a960f9663c13de393..412f737b30b512a49aa5b3ec8bbff84f9d6182d0 100644 (file)
--- a/src/NCollection/NCollection_UBTree.hxx
+++ b/src/NCollection/NCollection_UBTree.hxx
@@ -237,18 +237,16 @@ public:
 
   // ---------- PUBLIC METHODS ----------
 
+  /**
+   * Empty constructor.
+   */
+  NCollection_UBTree() : myRoot(0L), myLastNode(0L), myAlloc (NCollection_BaseAllocator::CommonBaseAllocator()) {}
+
   /**
    * Constructor.
    */
-  NCollection_UBTree
-    (const Handle(NCollection_BaseAllocator)& theAllocator=0L)
-      : myRoot(0L), myLastNode(0L)
-  {
-    if (theAllocator.IsNull())
-      myAlloc = NCollection_BaseAllocator::CommonBaseAllocator();
-    else
-      myAlloc = theAllocator;
-  }
+  explicit NCollection_UBTree (const Handle(NCollection_BaseAllocator)& theAllocator)
+  : myRoot(0L), myLastNode(0L), myAlloc (!theAllocator.IsNull() ? theAllocator : NCollection_BaseAllocator::CommonBaseAllocator()) {}
 
   /**
    * Update the tree with a new object and its bounding box.