stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r517283 - in /incubator/stdcxx/trunk/tests: include/23.list.h src/23.containers.cpp
Date Mon, 12 Mar 2007 17:03:20 GMT
Author: faridz
Date: Mon Mar 12 10:03:19 2007
New Revision: 517283

URL: http://svn.apache.org/viewvc?view=rev&rev=517283
Log:
2007-03-12  Farid Zaripov <Farid_Zaripov@epam.com>

	* 23.list.h (_rw_equal): Declared extern in order to allow
	it to be found by argument dependent lookup.
	* 23.containers.cpp (enum OverloadId): Added dummy enumeration.

Modified:
    incubator/stdcxx/trunk/tests/include/23.list.h
    incubator/stdcxx/trunk/tests/src/23.containers.cpp

Modified: incubator/stdcxx/trunk/tests/include/23.list.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/include/23.list.h?view=diff&rev=517283&r1=517282&r2=517283
==============================================================================
--- incubator/stdcxx/trunk/tests/include/23.list.h (original)
+++ incubator/stdcxx/trunk/tests/include/23.list.h Mon Mar 12 10:03:19 2007
@@ -225,7 +225,7 @@
 /**************************************************************************/
 
 template <class InputIter1, class InputIter2>
-static inline bool
+inline bool
 _rw_equal (InputIter1 first1, InputIter1 last1, InputIter2 first2)
 {
     for (; first1 != last1 && *first1 == *first2; ++first1, ++first2) ;
@@ -246,8 +246,7 @@
     ListCIter*    iters_;
     ListCPtr*     ptrs_;
 
-    ListState (List const & lst) : size_ (lst.size ()), iters_ (0), ptrs_ (0)
-    {
+    ListState (List const & lst) : size_ (lst.size ()), iters_ (0), ptrs_ (0) {
         iters_ = new ListCIter [size_];
         ptrs_  = new ListCPtr  [size_];
 
@@ -260,19 +259,18 @@
         }
     }
 
-    ~ListState ()
-    {
+    ~ListState () {
         delete [] iters_;
         delete [] ptrs_;
     }
 
     // invokes rw_assert() to verify that two states are the same
     void assert_equal (const ListState& state, int line,
-                       int case_line, const char* when) const
-    {
-        const int equal =    size_ == state.size_
-                          && _rw_equal (iters_, iters_ + size_, state.iters_)
-                          && _rw_equal (ptrs_,  ptrs_ + size_,  state.ptrs_);
+                       int case_line, const char* when) const {
+
+        const bool equal =    size_ == state.size_
+                           && _rw_equal (iters_, iters_ + size_, state.iters_)
+                           && _rw_equal (ptrs_,  ptrs_ + size_,  state.ptrs_);
 
         rw_assert (equal, 0, case_line,
                    "line %d: %{$FUNCALL}: object state unexpectedly changed "

Modified: incubator/stdcxx/trunk/tests/src/23.containers.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/tests/src/23.containers.cpp?view=diff&rev=517283&r1=517282&r2=517283
==============================================================================
--- incubator/stdcxx/trunk/tests/src/23.containers.cpp (original)
+++ incubator/stdcxx/trunk/tests/src/23.containers.cpp Mon Mar 12 10:03:19 2007
@@ -520,7 +520,9 @@
 // temporary, should be defined in 23.deque.h
 struct VectorIds : ContainerIds
 {
-    enum OverloadId {};
+    enum OverloadId {
+        dummy
+    };
 };
 
 static void
@@ -537,7 +539,9 @@
 // temporary, should be defined in 23.deque.h
 struct DequeIds : ContainerIds
 {
-    enum OverloadId {};
+    enum OverloadId {
+        dummy
+    };
 };
 
 static void
@@ -554,7 +558,9 @@
 // temporary, should be defined in 23.queue.h
 struct QueueIds : ContainerIds
 {
-    enum OverloadId {};
+    enum OverloadId {
+        dummy
+    };
 };
 
 static void
@@ -571,7 +577,9 @@
 // temporary, should be defined in 23.stack.h
 struct StackIds : ContainerIds
 {
-    enum OverloadId {};
+    enum OverloadId {
+        dummy
+    };
 };
 
 static void



Mime
View raw message