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

[Type, Helper] Remove unused __STL_MEMBER_TEMPLATES parts #4251

Merged
merged 5 commits into from
Nov 3, 2023
+0 −28
Merged

[Type, Helper] Remove unused __STL_MEMBER_TEMPLATES parts #4251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4376ed4
remove sgi stl member template macro
fredroy Oct 23, 2023
7e67698
Merge branch 'master' into remove_stl_member_template
bakpaul Oct 24, 2023
d2d6e77
Merge branch 'master' into remove_stl_member_template
fredroy Oct 26, 2023
63404c1
Merge branch 'master' into remove_stl_member_template
fredroy Oct 30, 2023
a61a38f
Merge branch 'master' into remove_stl_member_template
epernod Nov 3, 2023
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
6 changes: 0 additions & 6 deletions Sofa/framework/Helper/src/sofa/helper/integer_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,8 @@ class vector_id : public vector<T, MemoryManager>
/// Constructor
vector_id(const std::vector<T>& x): Inherit(x) {}

#ifdef __STL_MEMBER_TEMPLATES
/// Constructor
template <class InputIterator>
vector_id(InputIterator first, InputIterator last): Inherit(first,last) {}
#else /* __STL_MEMBER_TEMPLATES */
/// Constructor
vector_id(const_iterator first, const_iterator last): Inherit(first,last) {}
#endif /* __STL_MEMBER_TEMPLATES */

/// Read/write random access, with explicit Index
reference at(Index n)
Expand Down
9 changes: 0 additions & 9 deletions Sofa/framework/Helper/src/sofa/helper/map_ptr_stable_compare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,11 @@ class map_ptr_stable_compare : public std::map<Key, Tp, ptr_stable_compare<Key>
{
}

#ifdef __STL_MEMBER_TEMPLATES
/// Constructor
template <class InputIterator>
map_ptr_stable_compare(InputIterator first, InputIterator last)
:Inherit(first,last, key_compare(new stable_id_map_type()))
,m_stable_id_map(Inherit::key_comp().get_stable_id_map())
{}
#else /* __STL_MEMBER_TEMPLATES */
/// Constructor
map_ptr_stable_compare(const_iterator first, const_iterator last)
:Inherit(first,last, key_compare(new stable_id_map_type()) )
,m_stable_id_map(Inherit::key_comp().get_stable_id_map())
{}
#endif /* __STL_MEMBER_TEMPLATES */

private:
/// smart ptr for memory ownership
Expand Down
7 changes: 0 additions & 7 deletions Sofa/framework/Type/src/sofa/type/SVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,8 @@ class SVector: public type::vector<T, type::CPUMemoryManager<T> >
return *this;
}

#ifdef __STL_MEMBER_TEMPLATES
/// Constructor
template <class InputIterator>
SVector(InputIterator first, InputIterator last): Inherit(first,last) {}
#else /* __STL_MEMBER_TEMPLATES */
/// Constructor
SVector(typename SVector<T>::const_iterator first, typename SVector<T>::const_iterator last): Inherit(first,last) {}
#endif /* __STL_MEMBER_TEMPLATES */


std::ostream& write ( std::ostream& os ) const
{
Expand Down
6 changes: 0 additions & 6 deletions Sofa/framework/Type/src/sofa/type/vector_T.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,8 @@ class vector : public std::vector<T, std::allocator<T> >
return *this;
}

#ifdef __STL_MEMBER_TEMPLATES
/// Constructor
template <class InputIterator>
vector(InputIterator first, InputIterator last): std::vector<T,Alloc>(first,last) {}
#else /* __STL_MEMBER_TEMPLATES */
/// Constructor
vector(typename vector<T>::const_iterator first, typename vector<T>::const_iterator last): std::vector<T>(first,last) {}
#endif /* __STL_MEMBER_TEMPLATES */

/// Read/write random access
reference operator[](Size n)
Expand Down
Loading