From 1c2620dd6afc1eb5ad4946e7a2b8abc099b8f887 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 6 Jan 2013 21:58:18 +0000 Subject: [PATCH] unordered_map.h: Fix typo in comments. * include/bits/unordered_map.h: Fix typo in comments. * doc/xml/manual/status_cxx2011.xml: Add implementation-defined bucket counts for unordered associative containers. From-SVN: r194954 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/doc/xml/manual/status_cxx2011.xml | 9 +++++++++ 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,3 +1,9 @@ +2013-01-06 Jonathan Wakely + + * 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 * doc/xml/manual/abi.xml: Update library and symbol versions. 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 @@ -2634,6 +2634,15 @@ particular release. CopyAssignable. + + 23.5.4.2 [unord.map.cnstr], + 23.5.5.2 [unord.multimap.cnstr], + 23.5.6.2 [unord.set.cnstr], + 23.5.7.2 [unord.multiset.cnstr] + The default bucket count is 10 for the default constructors + and 0 for the range constructors and initializer-list constructors. + + 30.2.3 [thread.req.native]/1 native_handle_type and 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; /** -- 2.30.2