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

Correct noexcept mismatch in declarations. 

2017-12-05  Jason Merrill  <jason@redhat.com>
	    Jonathan Wakely  <jwakely@redhat.com>

	* include/bits/fs_fwd.h (copy, copy_file): Remove noexcept.
	(permissions): Add noexcept.
	* include/bits/fs_ops.h (permissions): Add noexcept.
	* libsupc++/eh_throw.cc (__cxa_init_primary_exception): Add
	_GLIBCXX_NOTHROW.

Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>

From-SVN: r255425
This commit is contained in:
Jason Merrill 2017-12-05 10:23:26 -05:00 committed by Jonathan Wakely
parent 9824a520b2
commit 0382bcfcda
4 changed files with 17 additions and 6 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 @@
2017-12-05 Jason Merrill <jason@redhat.com>
Jonathan Wakely <jwakely@redhat.com>
* include/bits/fs_fwd.h (copy, copy_file): Remove noexcept.
(permissions): Add noexcept.
* include/bits/fs_ops.h (permissions): Add noexcept.
* libsupc++/eh_throw.cc (__cxa_init_primary_exception): Add
_GLIBCXX_NOTHROW.
2017-12-04 Jonathan Wakely <jwakely@redhat.com> 2017-12-04 Jonathan Wakely <jwakely@redhat.com>
* include/bits/regex_compiler.tcc: Use C-style comment to work around * include/bits/regex_compiler.tcc: Use C-style comment to work around

6
libstdc++-v3/include/bits/fs_fwd.h
View File

@ -300,11 +300,11 @@ _GLIBCXX_END_NAMESPACE_CXX11
void copy(const path& __from, const path& __to, copy_options __options); void copy(const path& __from, const path& __to, copy_options __options);
void copy(const path& __from, const path& __to, copy_options __options, void copy(const path& __from, const path& __to, copy_options __options,
error_code&) noexcept; error_code&);
bool copy_file(const path& __from, const path& __to, copy_options __option); bool copy_file(const path& __from, const path& __to, copy_options __option);
bool copy_file(const path& __from, const path& __to, copy_options __option, bool copy_file(const path& __from, const path& __to, copy_options __option,
error_code&) noexcept; error_code&);
path current_path(); path current_path();
@ -319,7 +319,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
file_time_type last_write_time(const path&); file_time_type last_write_time(const path&);
file_time_type last_write_time(const path&, error_code&) noexcept; file_time_type last_write_time(const path&, error_code&) noexcept;
void permissions(const path&, perms, perm_options, error_code&); void permissions(const path&, perms, perm_options, error_code&) noexcept;
path proximate(const path& __p, const path& __base, error_code& __ec); path proximate(const path& __p, const path& __base, error_code& __ec);
path proximate(const path& __p, const path& __base, error_code& __ec); path proximate(const path& __p, const path& __base, error_code& __ec);

2
libstdc++-v3/include/bits/fs_ops.h
View File

@ -253,7 +253,7 @@ namespace filesystem
void void
permissions(const path& __p, perms __prms, perm_options __opts, permissions(const path& __p, perms __prms, perm_options __opts,
error_code& __ec); error_code& __ec) noexcept;
inline path proximate(const path& __p, error_code& __ec) inline path proximate(const path& __p, error_code& __ec)
{ return proximate(__p, current_path(), __ec); } { return proximate(__p, current_path(), __ec); }

6
libstdc++-v3/libsupc++/eh_throw.cc
View File

@ -53,8 +53,10 @@ __gxx_exception_cleanup (_Unwind_Reason_Code code, _Unwind_Exception *exc)
} }
extern "C" __cxa_refcounted_exception* extern "C" __cxa_refcounted_exception*
__cxxabiv1::__cxa_init_primary_exception(void *obj, std::type_info *tinfo, __cxxabiv1::
void (_GLIBCXX_CDTOR_CALLABI *dest) (void *)) __cxa_init_primary_exception(void *obj, std::type_info *tinfo,
void (_GLIBCXX_CDTOR_CALLABI *dest) (void *))
_GLIBCXX_NOTHROW
{ {
__cxa_refcounted_exception *header __cxa_refcounted_exception *header
= __get_refcounted_exception_header_from_obj (obj); = __get_refcounted_exception_header_from_obj (obj);