git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allocated_ptr.h (__allocated_ptr::operator=): Add missing return. 

* include/bits/allocated_ptr.h (__allocated_ptr::operator=): Add
	missing return.
	* include/experimental/any: Remove unused header.
	* include/std/functional (_Maybe_wrap_member_pointer): Fix comments.
	* testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error.
	* testsuite/util/testsuite_regex.h: Move include guard.

From-SVN: r212360
This commit is contained in:
Jonathan Wakely 2014-07-08 14:22:14 +01:00 committed by Jonathan Wakely
parent b2c06385fe
commit b3771d3f6f
6 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2014-07-08 Jonathan Wakely <jwakely@redhat.com>
* include/bits/allocated_ptr.h (__allocated_ptr::operator=): Add
missing return.
* include/experimental/any: Remove unused header.
* include/std/functional (_Maybe_wrap_member_pointer): Fix comments.
* testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error.
* testsuite/util/testsuite_regex.h: Move include guard.
2014-07-01 Tim Shen <timshen@google.com> 2014-07-01 Tim Shen <timshen@google.com>
PR libstdc++/61601 PR libstdc++/61601

7
libstdc++-v3/include/bits/allocated_ptr.h
View File

@ -73,7 +73,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
/// Release ownership of the owned pointer /// Release ownership of the owned pointer
__allocated_ptr& operator=(std::nullptr_t) noexcept { _M_ptr = nullptr; } __allocated_ptr&
operator=(std::nullptr_t) noexcept
{
_M_ptr = nullptr;
return *this;
}
/// Get the address that the owned pointer refers to. /// Get the address that the owned pointer refers to.
value_type* get() { return _S_raw_ptr(_M_ptr); } value_type* get() { return _S_raw_ptr(_M_ptr); }

1
libstdc++-v3/include/experimental/any
View File

@ -41,7 +41,6 @@
#include <type_traits> #include <type_traits>
#include <bits/alloc_traits.h> #include <bits/alloc_traits.h>
#include <bits/uses_allocator.h> #include <bits/uses_allocator.h>
#include <bits/functexcept.h>
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {

6
libstdc++-v3/include/std/functional
View File

@ -1184,8 +1184,8 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/** /**
* Maps member pointers into instances of _Mem_fn but leaves all * Maps member pointers into instances of _Mem_fn but leaves all
* other function objects untouched. Used by tr1::bind(). The * other function objects untouched. Used by std::bind(). The
* primary template handles the non--member-pointer case. * primary template handles the non-member-pointer case.
*/ */
template<typename _Tp> template<typename _Tp>
struct _Maybe_wrap_member_pointer struct _Maybe_wrap_member_pointer
@ -1203,7 +1203,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
/** /**
* Maps member pointers into instances of _Mem_fn but leaves all * Maps member pointers into instances of _Mem_fn but leaves all
* other function objects untouched. Used by tr1::bind(). This * other function objects untouched. Used by std::bind(). This
* partial specialization handles the member pointer case. * partial specialization handles the member pointer case.
*/ */
template<typename _Tp, typename _Class> template<typename _Tp, typename _Class>

2
libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
View File

@ -26,5 +26,5 @@ void test01()
using std::experimental::any_cast; using std::experimental::any_cast;
const any y(1); const any y(1);
any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 381 } any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 380 }
} }

6
libstdc++-v3/testsuite/util/testsuite_regex.h
View File

@ -19,13 +19,13 @@
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
// //
#ifndef _TESTSUITE_REGEX_H
#define _TESTSUITE_REGEX_H 1
#include <regex> #include <regex>
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#ifndef _TESTSUITE_REGEX_H
#define _TESTSUITE_REGEX_H 1
namespace __gnu_test namespace __gnu_test
{ {
// Test on a compilation of simple expressions, throw regex_error on error. // Test on a compilation of simple expressions, throw regex_error on error.