safe_unordered_base.h, [...]: New, support for unordered sequence safe local iterators.

[thirdparty/gcc.git] / libstdc++-v3 / include / debug / formatter.h

diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index 065a50274c5ef0681356b3cee62d04519fe5ed51..8da171972eb3fe2759ebacc9f4d9c84c03d48304 100644 (file)
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -1,6 +1,6 @@
 // Debug-mode error formatting implementation -*- C++ -*-
 
-// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -46,6 +46,9 @@ namespace __gnu_debug
   template<typename _Iterator, typename _Sequence>
     class _Safe_iterator;
 
+  template<typename _Iterator, typename _Sequence>
+    class _Safe_local_iterator;
+
   template<typename _Sequence>
     class _Safe_sequence;
 
@@ -103,7 +106,9 @@ namespace __gnu_debug
     // forward_list
     __msg_insert_after_end,
     __msg_erase_after_bad,
-    __msg_valid_range2
+    __msg_valid_range2,
+    // unordered sequence local iterators
+    __msg_local_iter_compare_bad
   };
 
   class _Error_formatter
@@ -236,6 +241,42 @@ namespace __gnu_debug
            }
        }
 
+      template<typename _Iterator, typename _Sequence>
+       _Parameter(const _Safe_local_iterator<_Iterator, _Sequence>& __it,
+                  const char* __name, _Is_iterator)
+       : _M_kind(__iterator),  _M_variant()
+       {
+         _M_variant._M_iterator._M_name = __name;
+         _M_variant._M_iterator._M_address = &__it;
+#ifdef __GXX_RTTI
+         _M_variant._M_iterator._M_type = &typeid(__it);
+#else
+         _M_variant._M_iterator._M_type = 0;
+#endif
+         _M_variant._M_iterator._M_constness =
+           std::__are_same<_Safe_local_iterator<_Iterator, _Sequence>,
+                           typename _Sequence::local_iterator>::
+             __value ? __mutable_iterator : __const_iterator;
+         _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
+#ifdef __GXX_RTTI
+         _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
+#else
+         _M_variant._M_iterator._M_seq_type = 0;
+#endif
+
+         if (__it._M_singular())
+           _M_variant._M_iterator._M_state = __singular;
+         else
+           {
+             if (__it._M_is_end())
+               _M_variant._M_iterator._M_state = __end;
+             else if (__it._M_is_begin())
+               _M_variant._M_iterator._M_state = __begin;
+             else
+               _M_variant._M_iterator._M_state = __middle;
+           }
+       }
+
       template<typename _Type>
         _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
         : _M_kind(__iterator), _M_variant()