Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACE6_TAO2] Remove checked_iterator.h #2305

Merged
merged 1 commit into from
Dec 11, 2024
Merged

[ACE6_TAO2] Remove checked_iterator.h #2305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions ACE/ace/Array_Map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
# include "ace/Array_Map.inl"
#endif /* !__ACE_INLINE__ */

#include "ace/checked_iterator.h"

#include <algorithm>

ACE_BEGIN_VERSIONED_NAMESPACE_DECL
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ACE/ace/ace.mpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,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
Expand Down
1 change: 0 additions & 1 deletion ACE/ace/ace_for_tao.mpc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
Value_Ptr.h
Version.h
ace_wchar.h
checked_iterator.h
config-WinCE.h
config-all.h
config-borland-common.h
Expand Down
56 changes: 0 additions & 56 deletions ACE/ace/checked_iterator.h
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions TAO/tao/Generic_Sequence_T.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
*/

#include "tao/Range_Checking_T.h"
#include "ace/checked_iterator.h"

#include <algorithm>

Expand Down Expand Up @@ -155,7 +154,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);
}

Expand Down Expand Up @@ -239,7 +238,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);
}
Expand Down
5 changes: 2 additions & 3 deletions TAO/tao/Unbounded_Octet_Sequence_T.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
Loading