Merge pull request #2294 from Osyotr/checked_iterator_nuke

Remove checked_iterator.h
DOCGroup · Oct 25, 2024 · e9de6a1 · e9de6a1
2 parents 20192e6 + f100e7f
commit e9de6a1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 85 deletions.
diff --git a/ACE/NEWS b/ACE/NEWS
@@ -1,6 +1,9 @@
 USER VISIBLE CHANGES BETWEEN ACE-8.0.1 and ACE-8.0.2
 ====================================================
 
+. Removed ACE_make_checked_array_iterator that used deprecated
+  stdext::checked_array_iterator 
+
 . Embarcadero C++ Builder bcc64x compiler supported has been
   updated to match the C++Builder 12.2 release
 

diff --git a/ACE/ace/Array_Map.cpp b/ACE/ace/Array_Map.cpp
@@ -7,8 +7,6 @@
 # include "ace/Array_Map.inl"
 #endif  /* !__ACE_INLINE__ */
 
-#include "ace/checked_iterator.h"
-
 #include <algorithm>
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -23,8 +21,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::ACE_Array_Map (InputIterator f,
 {
   (void) std::uninitialized_copy (f,
                                   l,
-                                  ACE_make_checked_array_iterator (this->begin (),
-                                                                   this->size_));
+                                  this->begin ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
@@ -36,8 +33,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::ACE_Array_Map (
 {
   (void) std::uninitialized_copy (map.begin (),
                                   map.end (),
-                                  ACE_make_checked_array_iterator (this->begin (),
-                                                                   this->size_));
+                                  this->begin ());
 }
 
 template<typename Key, typename Value, class EqualTo, class Alloc>
@@ -215,8 +211,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::grow (
 
       std::copy (this->begin (),
                  this->end (),
-                 ACE_make_checked_array_iterator (temp.begin (),
-                                                  temp.capacity_));
+                 temp.begin ());
 
       size_type const n = this->size ();  // Do not swap out the size
                                           // since we bypassed the
@@ -241,8 +236,7 @@ operator== (ACE_Array_Map<Key, Value, EqualTo, Alloc> const & lhs,
   return (lhs.size () == rhs.size ()
           && std::equal (lhs.begin (),
                          lhs.end (),
-                         ACE_make_checked_array_iterator (rhs.begin (),
-                                                          rhs.size ())));
+                         rhs.begin ()));
 }
 
 template <typename Key, typename Value, class EqualTo, class Alloc>

diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
@@ -462,7 +462,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Version.h
     Versioned_Namespace.h
     ace_wchar.h
-    checked_iterator.h
     config-*.h
     config.h
     iosfwd.h

diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
@@ -355,7 +355,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Value_Ptr.h
     Version.h
     ace_wchar.h
-    checked_iterator.h
     config-all.h
     config-lite.h
     config-win32-borland.h

diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h
diff --git a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb
@@ -51,17 +51,6 @@ feature(vc_avoid_winsock_warnings) {
   }
 }
 
-feature(vc_avoid_stdext_arr_iters_warning) {
-  specific(prop:microsoft) {
-    macros += _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
-  }
-  verbatim(cmake, macros, 1) {
-    if(MSVC)
-    "  add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)"
-    endif()
-  }
-}
-
 feature(vc_avoid_hides_local_declaration) {
   specific(vc14) {
     DisableSpecificWarnings += 4456

diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h
@@ -55,7 +55,6 @@
  */
 
 #include "tao/Range_Checking_T.h"
-#include "ace/checked_iterator.h"
 
 #include <algorithm>
 
@@ -127,7 +126,7 @@ class generic_sequence
     element_traits::copy_range(
         rhs.buffer_,
         rhs.buffer_ + rhs.length_,
-        ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
+        tmp.buffer_);
     swap(tmp);
   }
 
@@ -211,7 +210,7 @@ class generic_sequence
     element_traits::copy_swap_range(
       buffer_,
       buffer_ + length_,
-      ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
+      tmp.buffer_);
 
     swap(tmp);
   }

diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h
@@ -22,7 +22,6 @@
 #include "tao/Basic_Types.h"
 #include "ace/Message_Block.h"
 #include "ace/OS_Memory.h"
-#include "ace/checked_iterator.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -140,7 +139,7 @@ class TAO_Export unbounded_value_sequence<CORBA::Octet>
             element_traits::copy_range(
               buffer_,
               buffer_ + length,
-              ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
+              tmp.buffer_);
             swap(tmp);
           }
         return;
@@ -151,7 +150,7 @@ class TAO_Export unbounded_value_sequence<CORBA::Octet>
     element_traits::copy_range(
       buffer_,
       buffer_ + length_,
-      ACE_make_checked_array_iterator (tmp.buffer_, tmp.length_));
+      tmp.buffer_);
     swap(tmp);
   }
   inline value_type const & operator[](CORBA::ULong i) const {