mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
[10874] Update ACE to v5.8.3
(based on zergtmn's repo commit 3a8c259) (based on zergtmn's repo commit 946c1a8) Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
c38c876b1d
commit
b8d773091a
343 changed files with 3060 additions and 7431 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// $Id: Vector_T.cpp 80826 2008-03-04 14:51:23Z wotte $
|
||||
// $Id: Vector_T.cpp 92069 2010-09-28 11:38:59Z johnnyw $
|
||||
|
||||
#ifndef ACE_VECTOR_T_CPP
|
||||
#define ACE_VECTOR_T_CPP
|
||||
|
|
@ -40,7 +40,7 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem)
|
|||
}
|
||||
else
|
||||
ACE_Array<T>::size (length_ + 1);
|
||||
|
||||
|
||||
++length_;
|
||||
(*this)[length_-1] = elem;
|
||||
}
|
||||
|
|
@ -48,14 +48,6 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem)
|
|||
template <class T, size_t DEFAULT_SIZE>
|
||||
void ACE_Vector<T, DEFAULT_SIZE>::dump (void) const
|
||||
{
|
||||
#if defined (ACE_HAS_DUMP)
|
||||
#if 0
|
||||
// Can't do this unless the vector is an object with a dump
|
||||
// function.
|
||||
for (size_t i = 0; i < this->size (); ++i)
|
||||
(*this)[i].dump ();
|
||||
#endif /* 0 */
|
||||
#endif /* ACE_HAS_DUMP */
|
||||
}
|
||||
|
||||
// Compare this vector with <s> for equality.
|
||||
|
|
@ -75,61 +67,6 @@ ACE_Vector<T, DEFAULT_SIZE>::operator== (const ACE_Vector<T, DEFAULT_SIZE> &s) c
|
|||
return true;
|
||||
}
|
||||
|
||||
#if 0
|
||||
template<class T>
|
||||
int compare(const ACE_Vector<T>& v1,
|
||||
const ACE_Vector<T>& v2,
|
||||
const size_t from_ndx,
|
||||
const size_t to_ndx)
|
||||
{
|
||||
size_t last1 = v1.size () - 1;
|
||||
size_t last2 = v2.size () - 1;
|
||||
if (last1 < from_ndx || last1 < to_ndx)
|
||||
return false;
|
||||
if (last2 < from_ndx || last2 < to_ndx)
|
||||
return false;
|
||||
if (last1 != last2)
|
||||
return false;
|
||||
|
||||
// cout<<"compare() <================="<<endl;
|
||||
for (size_t i = from_ndx; i <= to_ndx; ++i)
|
||||
// cout<<"V1["<<i<<"]="<<v1[i];
|
||||
// cout<<", V2["<<i<<"]="<<v2[i];
|
||||
// cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl;
|
||||
if (v1[i] != v2[i])
|
||||
return false;
|
||||
|
||||
// cout<<"compare() ====================>"<<endl;
|
||||
return true;
|
||||
}
|
||||
|
||||
template<class T>
|
||||
int partial_compare(const ACE_Vector<T>& v1,
|
||||
const ACE_Vector<T>& v2,
|
||||
const size_t from_ndx,
|
||||
const size_t to_ndx)
|
||||
{
|
||||
size_t last1 = v1.size () - 1;
|
||||
size_t last2 = v2.size () - 1;
|
||||
|
||||
if (last1 < from_ndx || last1 < to_ndx)
|
||||
return false;
|
||||
if (last2 < from_ndx || last2 < to_ndx)
|
||||
return false;
|
||||
|
||||
// cout<<"partial_compare() <================="<<endl;
|
||||
for (size_t i = from_ndx; i <= to_ndx; ++i)
|
||||
// cout<<"V1["<<i<<"]="<<v1[i];
|
||||
// cout<<", V2["<<i<<"]="<<v2[i];
|
||||
// cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl;
|
||||
if (v1[i] != v2[i])
|
||||
return false;
|
||||
|
||||
// cout<<"partial_compare() ====================>"<<endl;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
// ****************************************************************
|
||||
|
||||
template <class T, size_t DEFAULT_SIZE> int
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue