diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-06 21:58:18 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-06 21:58:18 +0000 |
| commit | ca9e31fa509c5dc3ac8d8b6ecf1d5d04f389b8e1 (patch) | |
| tree | b76c8ec190157aaad0725d6bcffdd9411b094897 | |
| parent | 383f9c66a3972f292df21484e2d96999d204e143 (diff) | |
| download | ppe42-gcc-ca9e31fa509c5dc3ac8d8b6ecf1d5d04f389b8e1.tar.gz ppe42-gcc-ca9e31fa509c5dc3ac8d8b6ecf1d5d04f389b8e1.zip | |
* include/bits/unordered_map.h: Fix typo in comments.
* doc/xml/manual/status_cxx2011.xml: Add implementation-defined bucket
counts for unordered associative containers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194954 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/doc/xml/manual/status_cxx2011.xml | 9 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/unordered_map.h | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d37ba268ff1..ab150bec331 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2013-01-06 Jonathan Wakely <jwakely.gcc@gmail.com> + * include/bits/unordered_map.h: Fix typo in comments. + * doc/xml/manual/status_cxx2011.xml: Add implementation-defined bucket + counts for unordered associative containers. + +2013-01-06 Jonathan Wakely <jwakely.gcc@gmail.com> + * doc/xml/manual/abi.xml: Update library and symbol versions. 2013-01-06 Richard Sandiford <rdsandiford@googlemail.com> diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml index 0164b0b756d..c0780de74e5 100644 --- a/libstdc++-v3/doc/xml/manual/status_cxx2011.xml +++ b/libstdc++-v3/doc/xml/manual/status_cxx2011.xml @@ -2635,6 +2635,15 @@ particular release. </para> <para> + <emphasis>23.5.4.2 [unord.map.cnstr]</emphasis>, + <emphasis>23.5.5.2 [unord.multimap.cnstr]</emphasis>, + <emphasis>23.5.6.2 [unord.set.cnstr]</emphasis>, + <emphasis>23.5.7.2 [unord.multiset.cnstr]</emphasis> + The default bucket count is 10 for the default constructors + and 0 for the range constructors and initializer-list constructors. + </para> + + <para> <emphasis>30.2.3 [thread.req.native]/1</emphasis> <classname>native_handle_type</classname> and <methodname>native_handle</methodname> are provided. The handle types diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index e2b83db3700..9fa0553f211 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -1,6 +1,6 @@ // unordered_map implementation -*- C++ -*- -// Copyright (C) 2010, 2011, 2012 Free Software Foundation, Inc. +// Copyright (C) 2010-2013 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -167,7 +167,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Copy constructor. unordered_map(const unordered_map&) = default; - /// Move constrcutor. + /// Move constructor. unordered_map(unordered_map&&) = default; /** @@ -848,7 +848,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Copy constructor. unordered_multimap(const unordered_multimap&) = default; - /// Move constrcutor. + /// Move constructor. unordered_multimap(unordered_multimap&&) = default; /** |
