svn commit: r682549 - /stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp

[vitek]

Author: vitek
Date: Mon Aug  4 17:16:41 2008
New Revision: 682549

URL: http://svn.apache.org/viewvc?rev=682549&view=rev
Log:
2008-08-04  Travis Vitek  <[EMAIL PROTECTED]>

        Merge r682548 from branches/4.2.x

        2008-08-04  Travis Vitek  <[EMAIL PROTECTED]>

        STDCXX-776
        * tests/containers/23.list.erase.cpp (test_erase): Asserted
        precondition to silence another bugus HP aCC 6/cadvise warning.

Modified:
    stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp

Modified: stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp
URL: 
http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp?rev=682549&r1=682548&r2=682549&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp (original)
+++ stdcxx/branches/4.3.x/tests/containers/23.list.erase.cpp Mon Aug  4 
17:16:41 2008
@@ -383,13 +383,19 @@
                      "line %d. %{$FUNCALL} != end()", __LINE__);
              }
              else {
+
+                 // assert precondition to silence a bogus HP cadvise
+                 // warning #20200-D: Potential null pointer dereference
+                 const ListIter::pointer pres_iter = &*res_iter;
+                 RW_ASSERT (pres_iter != 0);
+
                  bool success =
-                     tdata.res_ [tcase.off].data_.val_ == res_iter->data_.val_;
+                     tdata.res_ [tcase.off].data_.val_ == 
pres_iter->data_.val_;
 
                  rw_assert (success, 0, tcase.line,
                      "line %d. %{$FUNCALL} == %{#c}, got %{#c}",
                      __LINE__, char (tdata.res_ [tcase.off].data_.val_),
-                     char (res_iter->data_.val_));
+                     char (pres_iter->data_.val_));
              }
         }