[committed,3/3] libstdc++: Fix tzdb.cc to compile with -fno-exceptions

Message ID 20230110114657.636853-3-jwakely@redhat.com
State Repeat Merge
Headers
Series [committed,1/3] libstdc++: Fix std::span constraint for sizeof(size_t) < sizeof(int) [PR108221] |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Wakely Jan. 10, 2023, 11:46 a.m. UTC
  Tested x86_64-linux. Pushed to trunk.

-- >8 --

libstdc++-v3/ChangeLog:

	* src/c++20/tzdb.cc (tzdb_list::_S_init_tzdb): Use __try and
	__catch macros for exception handling.
---
 libstdc++-v3/src/c++20/tzdb.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Patch

diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
index 7227fe7cfe6..e335ea61c4d 100644
--- a/libstdc++-v3/src/c++20/tzdb.cc
+++ b/libstdc++-v3/src/c++20/tzdb.cc
@@ -1197,11 +1197,11 @@  namespace std::chrono
   const tzdb&
   tzdb_list::_Node::_S_init_tzdb()
   {
-    try
+    __try
       {
 	return reload_tzdb();
       }
-    catch (const std::exception&)
+    __catch (const std::exception&)
       {
 	auto [leaps, ok] = _S_read_leap_seconds();