aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/ext/bitmap_allocator.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7159783..d8652be 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-14 Paolo Carlini <pcarlini@suse.de>
+
+ * include/ext/bitmap_allocator.h (bitmap_allocator::_Alloc_block):
+ Rename __unused to __M_unused.
+
2004-10-14 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/ext/headers.cc: Add includes, compile only.
diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h
index 5841c7f..dfb7cba 100644
--- a/libstdc++-v3/include/ext/bitmap_allocator.h
+++ b/libstdc++-v3/include/ext/bitmap_allocator.h
@@ -783,7 +783,7 @@ namespace __gnu_cxx
struct _Alloc_block
{
- char __unused[aligned_size<sizeof(value_type), 8>::value];
+ char __M_unused[aligned_size<sizeof(value_type), 8>::value];
};