aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/src
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2015-08-25 20:22:47 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2015-08-25 20:22:47 +0000
commit25c65938c8794115531d09a37e17d3bc469f6269 (patch)
tree7c25723be55ff12a9a21251046c38733e1f1587b /libstdc++-v3/src
parent2f40eaca146906d75e95630f7bb3e5a27c3a5613 (diff)
downloadgcc-25c65938c8794115531d09a37e17d3bc469f6269.zip
gcc-25c65938c8794115531d09a37e17d3bc469f6269.tar.gz
gcc-25c65938c8794115531d09a37e17d3bc469f6269.tar.bz2
Revert my change to commit with PR reference again.
From-SVN: r227187
Diffstat (limited to 'libstdc++-v3/src')
-rw-r--r--libstdc++-v3/src/c++11/debug.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
index 997c0f3..f60e31f 100644
--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
@@ -185,8 +185,7 @@ namespace __gnu_debug
"load factor shall be positive",
"allocators must be equal",
"attempt to insert with an iterator range [%1.name;, %2.name;) from this"
- " container",
- "comparison doesn't meet irreflexive requirements, assert(!(a < a))"
+ " container"
};
void
@@ -593,13 +592,11 @@ namespace
{
const int __bufsize = 64;
char __buf[__bufsize];
- __formatter->_M_format_word(__buf, __bufsize, "\"%s\"",
+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ",
__variant._M_name);
__formatter->_M_print_word(__buf);
}
- __formatter->_M_print_word(" {\n");
-
if (__variant._M_type)
{
__formatter->_M_print_word(" type = ");
@@ -771,7 +768,6 @@ namespace __gnu_debug
_M_variant._M_iterator._M_sequence);
__formatter->_M_print_word(__buf);
}
-
__formatter->_M_print_word("}\n");
break;
case __sequence:
@@ -790,12 +786,10 @@ namespace __gnu_debug
if (_M_variant._M_instance._M_type)
__formatter->_M_print_word(";\n");
- __formatter->_M_print_word("}\n");
break;
case __iterator_value_type:
__formatter->_M_print_word("iterator::value_type ");
print_description(__formatter, _M_variant._M_iterator_value_type);
- __formatter->_M_print_word("}\n");
break;
default:
break;