+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>
PR libstdc++/61601
}
/// 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.
value_type* get() { return _S_raw_ptr(_M_ptr); }
#include <type_traits>
#include <bits/alloc_traits.h>
#include <bits/uses_allocator.h>
-#include <bits/functexcept.h>
namespace std _GLIBCXX_VISIBILITY(default)
{
/**
* Maps member pointers into instances of _Mem_fn but leaves all
- * other function objects untouched. Used by tr1::bind(). The
- * primary template handles the non--member-pointer case.
+ * other function objects untouched. Used by std::bind(). The
+ * primary template handles the non-member-pointer case.
*/
template<typename _Tp>
struct _Maybe_wrap_member_pointer
/**
* 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.
*/
template<typename _Tp, typename _Class>
using std::experimental::any_cast;
const any y(1);
- any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 381 }
+ any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 380 }
}
// <http://www.gnu.org/licenses/>.
//
+#ifndef _TESTSUITE_REGEX_H
+#define _TESTSUITE_REGEX_H 1
+
#include <regex>
#include <stdexcept>
#include <iostream>
-#ifndef _TESTSUITE_REGEX_H
-#define _TESTSUITE_REGEX_H 1
-
namespace __gnu_test
{
// Test on a compilation of simple expressions, throw regex_error on error.