From ffd7a3aa4f0a62b217a69c549a41bee8ddad9783 Mon Sep 17 00:00:00 2001
From: dpasukhi <dpasukhi@opencascade.com>
Date: Wed, 6 Dec 2023 10:42:54 +0000
Subject: [PATCH] 0033544: Foundation Classes - Fixing compiler problems
 [HotFix]

Fixed problem with Clang-16
Fixed problem with SWIG-4
Fixed genproj procedure
---
 adm/UDLIST                                   |  1 +
 src/Message/Message_AttributeMeter.cxx       |  2 +-
 src/NCollection/NCollection_Array1.hxx       | 20 ++------------------
 src/NCollection/NCollection_DynamicArray.hxx | 18 +-----------------
 src/NCollection/NCollection_Iterator.hxx     | 10 ++++++++++
 5 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/adm/UDLIST b/adm/UDLIST
index 14f425239d..9441779af1 100644
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -32,6 +32,7 @@ n UnitsAPI
 n gp
 n math
 r OS
+n FlexLexer
 t TKMath
 t TKernel
 n Adaptor2d
diff --git a/src/Message/Message_AttributeMeter.cxx b/src/Message/Message_AttributeMeter.cxx
index d6be5057ef..e50976c910 100644
--- a/src/Message/Message_AttributeMeter.cxx
+++ b/src/Message/Message_AttributeMeter.cxx
@@ -253,6 +253,6 @@ void Message_AttributeMeter::DumpJson (Standard_OStream& theOStream,
        anIterator.More(); anIterator.Next())
   {
     OCCT_DUMP_VECTOR_CLASS (theOStream, Message::MetricToString (anIterator.Key()),
-                            2, anIterator.Value(), anIterator.Value())
+                            2, anIterator.Value().first, anIterator.Value().second)
   }
 }
diff --git a/src/NCollection/NCollection_Array1.hxx b/src/NCollection/NCollection_Array1.hxx
index 4dcabc29f5..a52b6cc908 100644
--- a/src/NCollection/NCollection_Array1.hxx
+++ b/src/NCollection/NCollection_Array1.hxx
@@ -72,26 +72,10 @@ public:
 
   using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, false>;
   using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, true>;
+  using Iterator = NCollection_Iterator<NCollection_Array1<TheItemType>>;
 
 public:
 
-  // Iterator class
-  class Iterator : public NCollection_Iterator<NCollection_Array1>
-  {
-  public:
-    using NCollection_Iterator<NCollection_Array1>::NCollection_Iterator;
-
-    const_reference Value() const
-    {
-      return *NCollection_Iterator<NCollection_Array1>::ValueIter();
-    }
-
-    reference ChangeValue()
-    {
-      return *NCollection_Iterator<NCollection_Array1>::ChangeValueIter();
-    }
-  };
-
   const_iterator begin() const
   {
     return const_iterator(*this);
@@ -150,7 +134,7 @@ public:
     mySize(theUpper - theLower + 1),
     myPointer(nullptr),
     myIsOwner(false),
-    allocator_type(theAlloc)
+    myAllocator(theAlloc)
   {
     if (mySize == 0)
     {
diff --git a/src/NCollection/NCollection_DynamicArray.hxx b/src/NCollection/NCollection_DynamicArray.hxx
index 5c7ebc655b..ac93f52908 100644
--- a/src/NCollection/NCollection_DynamicArray.hxx
+++ b/src/NCollection/NCollection_DynamicArray.hxx
@@ -77,26 +77,10 @@ public:
 
   using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, false>;
   using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, true>;
+  using Iterator = NCollection_Iterator<NCollection_DynamicArray<TheItemType>>;
 
 public:
 
-  // Iterator class
-  class Iterator : public NCollection_Iterator<NCollection_DynamicArray>
-  {
-  public:
-    using NCollection_Iterator<NCollection_DynamicArray>::NCollection_Iterator;
-
-    const_reference Value() const
-    {
-      return *NCollection_Iterator<NCollection_DynamicArray>::ValueIter();
-    }
-
-    reference ChangeValue()
-    {
-      return *NCollection_Iterator<NCollection_DynamicArray>::ChangeValueIter();
-    }
-  };
-
   const_iterator begin() const
   {
     return const_iterator(*this);
diff --git a/src/NCollection/NCollection_Iterator.hxx b/src/NCollection/NCollection_Iterator.hxx
index ec4481ae40..268adf2f91 100644
--- a/src/NCollection/NCollection_Iterator.hxx
+++ b/src/NCollection/NCollection_Iterator.hxx
@@ -94,6 +94,16 @@ public:
     ++(myCur);
   }
 
+  const typename Container::const_reference Value() const
+  {
+    return *myCur;
+  }
+
+  const typename Container::reference ChangeValue()
+  {
+    return *myCur;
+  }
+
   bool operator==(const NCollection_Iterator& theOther) { return myLast == theOther.myLast && myCur == theOther.myCur; }
 
   bool operator!=(const NCollection_Iterator& theOther) { return myLast != theOther.myLast || myCur != theOther.myCur; }