diff options
Diffstat (limited to 'ace/Vector_T.cpp')
| -rw-r--r-- | ace/Vector_T.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/ace/Vector_T.cpp b/ace/Vector_T.cpp index adf9727c6ff..2dcbd96f67c 100644 --- a/ace/Vector_T.cpp +++ b/ace/Vector_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#ifndef ACE_VECTOR_T_CPP -#define ACE_VECTOR_T_CPP +#ifndef ACE_VECTOR_T_C +#define ACE_VECTOR_T_C #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -13,13 +13,13 @@ #include "ace/Vector_T.inl" #endif /* __ACE_INLINE__ */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_RCSID(ace, Vector_T, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_Vector) template <class T, size_t DEFAULT_SIZE> void ACE_Vector<T, DEFAULT_SIZE>::resize (const size_t new_size, - const T& t) + const T& t) { ACE_Array<T>::size (new_size); if (new_size > length_) @@ -101,9 +101,9 @@ int compare(const ACE_Vector<T>& v1, // cout<<", V2["<<i<<"]="<<v2[i]; // cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl; if (v1[i] != v2[i]) - { - return false; - } + { + return false; + } } // cout<<"compare() ====================>"<<endl; return true; @@ -111,9 +111,9 @@ int compare(const ACE_Vector<T>& v1, 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) + 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; @@ -132,9 +132,9 @@ int partial_compare(const ACE_Vector<T>& v1, // cout<<", V2["<<i<<"]="<<v2[i]; // cout<<": NOT EQUAL == "<<(v1[i]!=v2[i])<<endl; if (v1[i] != v2[i]) - { - return false; - } + { + return false; + } } // cout<<"partial_compare() ====================>"<<endl; return true; @@ -160,6 +160,4 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::next (T *&item) } } -ACE_END_VERSIONED_NAMESPACE_DECL - -#endif /* ACE_VECTOR_T_CPP */ +#endif /* ACE_VECTOR_T_C */ |