Author: faridz
Date: Fri Oct 26 11:54:48 2007
New Revision: 588748
URL: http://svn.apache.org/viewvc?rev=588748&view=rev
Log:
2007-10-26 Farid Zaripov <[EMAIL PROTECTED]>
Merged r588744 from branches/4.2.x
* 23.vector.allocator.cpp (address): Use the proper Pointer<> ctor.
Modified:
incubator/stdcxx/trunk/tests/containers/23.vector.allocator.cpp
Modified: incubator/stdcxx/trunk/tests/containers/23.vector.allocator.cpp
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/containers/23.vector.allocator.cpp?rev=588748&r1=588747&r2=588748&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/containers/23.vector.allocator.cpp (original)
+++ incubator/stdcxx/trunk/tests/containers/23.vector.allocator.cpp Fri Oct 26
11:54:48 2007
@@ -5,7 +5,7 @@
* Test exercising vector specialized on a user-defined allocator
* with a user-defined pointer type.
*
- * $Id:$
+ * $Id$
*
***************************************************************************
*
@@ -165,11 +165,12 @@
typedef std::random_access_iterator_tag iterator_category;
pointer address (reference r) const {
- return pointer (&r);
+ return pointer (_RWSTD_REINTERPRET_CAST (difference_type, &r), 1);
}
const_pointer address (const_reference r) const {
- return const_pointer (&r);
+ return const_pointer (_RWSTD_REINTERPRET_CAST (difference_type, &r),
+ 1);
}
Allocator () throw () {}