stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r414926 - /incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp
Date Fri, 16 Jun 2006 21:30:46 GMT
Author: sebor
Date: Fri Jun 16 14:30:46 2006
New Revision: 414926

URL: http://svn.apache.org/viewvc?rev=414926&view=rev
Log:
2006-06-16  Martin Sebor  <sebor@roguewave.com>

	* specialized.cpp (type_name): Added an overload for const
	volatile T*.
	(run_test): Exercised std::uninitialized_copy() specialized
	on InputIterator=const volatile int* to further exercise
	STDCXX-203.

Modified:
    incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp

Modified: incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp?rev=414926&r1=414925&r2=414926&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp (original)
+++ incubator/stdcxx/trunk/tests/utilities/20.specialized.cpp Fri Jun 16 14:30:46 2006
@@ -2,7 +2,7 @@
  *
  * specialized.cpp - test exercising 20.4.4 [lib.specialized.algorithms]
  *
- * $Id: //stdlib/dev/tests/stdlib/utilities/specialized.cpp#2 $
+ * $Id: //stdlib/dev/tests/stdlib/utilities/specialized.cpp#3 $
  *
  ***************************************************************************
  *
@@ -78,6 +78,9 @@
 const char* type_name (volatile T*, T*) { return "volatile T*"; }
 
 template <class T>
+const char* type_name (const volatile T*, T*) { return "const volatile T*"; }
+
+template <class T>
 volatile T* make_iter (T *beg, T*, T*, volatile T*) { return beg; }
 
 /**************************************************************************/
@@ -89,7 +92,7 @@
 void test_uninitialized_copy (const InputIterator &dummy,
                               const ForwardIterator*)
 {
-    const char* const i1name = type_name (InputIterator (0, 0, 0), (int*)0);
+    const char* const i1name = type_name (dummy, (int*)0);
     const char* const i2name = type_name (ForwardIterator (), (Y*)0);
 
     rw_info (0, 0, __LINE__, "std::uninitialized_copy(%s, %1$s, %s)",
@@ -273,6 +276,9 @@
 static int
 run_test (int, char**)
 {
+    typedef const volatile int* ConstVolatilePointer;
+    typedef /* */ volatile Y*   VolatilePointer;
+
     if (-1 < opt_copy) {
         if (-1 < opt_input_iter)
             test_uninitialized_copy (InputIter<int>(0, 0, 0));
@@ -292,18 +298,22 @@
             rw_note (-1 > opt_bidir_iter--, 0, __LINE__,
                      "BidirectionalIterator tests disabled");
 
-        if (-1 < opt_bidir_iter)
+        if (-1 < opt_rnd_iter)
             test_uninitialized_copy (ConstRandomAccessIter<int>());
         else
-            rw_note (-1 > opt_bidir_iter--, 0, __LINE__,
+            rw_note (-1 > opt_rnd_iter--, 0, __LINE__,
                      "RandomAccessIterator tests disabled");
+
+        if (-1 < opt_volatile_ptr)
+            test_uninitialized_copy (ConstVolatilePointer ());
+        else
+            rw_note (-1 > opt_volatile_ptr--, 0, __LINE__,
+                     "volatile T* tests disabled");
     }
     else
         rw_note (0, 0, 0, "tests of std::uninitialized_copy disabled");
 
     //////////////////////////////////////////////////////////////////
-
-    typedef volatile Y* VolatilePointer;
 
     if (-1 < opt_fill) {
         if (-1 < opt_fwd_iter)



Mime
View raw message