From f9d2680e19f24f5832c6a6dbdc107546d68a4e21 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Thu, 12 Sep 2013 00:10:44 +0000 Subject: [PATCH] A collection of minor type-o fixes. The first two aren't testable, but all tests pass with them. I stumbled across them while experimenting with a std::move that checks its argument for non-const. The third corrects a test that is currently failing. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@190563 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/map | 2 +- include/unordered_map | 2 +- .../sequences/forwardlist/forwardlist.cons/size.pass.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/map b/include/map index c78231d0..82a0a9c9 100644 --- a/include/map +++ b/include/map @@ -753,7 +753,7 @@ private: : __cc(std::forward<_Args>(__args)...) {} __value_type(const __value_type& __v) - : __cc(std::move(__v.__cc)) {} + : __cc(__v.__cc) {} __value_type(__value_type&& __v) : __nc(std::move(__v.__nc)) {} diff --git a/include/unordered_map b/include/unordered_map index b53af146..fc30c2a5 100644 --- a/include/unordered_map +++ b/include/unordered_map @@ -641,7 +641,7 @@ private: : __cc(std::forward<_Args>(__args)...) {} __value_type(const __value_type& __v) - : __cc(std::move(__v.__cc)) {} + : __cc(__v.__cc) {} __value_type(__value_type&& __v) : __nc(std::move(__v.__nc)) {} diff --git a/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp b/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp index 81eb8666..fb71b318 100644 --- a/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp +++ b/test/containers/sequences/forwardlist/forwardlist.cons/size.pass.cpp @@ -25,7 +25,7 @@ void check_allocator(unsigned n, Allocator const &alloc = Allocator()) typedef std::forward_list C; C d(n, alloc); assert(d.get_allocator() == alloc); - assert(std::distance(l.begin(), l.end()) == n); + assert(std::distance(d.begin(), d.end()) == n); #endif }