Fix end() on ACE_Vector

It was based on the the base array, not the actual elements in the
array.

2 files changed, 22 insertions, 0 deletions

diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h
index 13c4ba0302d..a5be43470b5 100644
--- a/ACE/ace/Vector_T.h
+++ b/ACE/ace/Vector_T.h
@@ -188,6 +188,16 @@ public:
 
   void swap (ACE_Vector &rhs);
 
+  /*
+   * Implement our own end functions because Array_Base's end functions use the
+   * current capacity, not the Vector's actual element count!
+   */
+  /// C++ Standard End Iterator
+  ///{
+  typename ACE_Array_Base<T>::iterator end ();
+  typename ACE_Array_Base<T>::const_iterator end () const;
+  ///}
+
 protected:
 
   /**
diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl
index 81382438534..103bb93beec 100644
--- a/ACE/ace/Vector_T.inl
+++ b/ACE/ace/Vector_T.inl
@@ -45,6 +45,18 @@ void ACE_Vector<T, DEFAULT_SIZE>::pop_back (void)
     }
 }
 
+template <class T, size_t DEFAULT_SIZE> ACE_INLINE
+typename ACE_Array_Base<T>::iterator ACE_Vector<T, DEFAULT_SIZE>::end ()
+{
+  return ACE_Array_Base<T>::array_ + length_;
+}
+
+template <class T, size_t DEFAULT_SIZE> ACE_INLINE
+typename ACE_Array_Base<T>::const_iterator ACE_Vector<T, DEFAULT_SIZE>::end () const
+{
+  return ACE_Array_Base<T>::array_ + length_;
+}
+
 // Compare this vector with <s> for inequality.
 
 template <class T, size_t DEFAULT_SIZE> ACE_INLINE bool