re PR libstdc++/25191 (exception_defines.h #defines try/catch)

[thirdparty/gcc.git] / libstdc++-v3 / include / ext / rc_string_base.h

diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h
index 213e3cf1c97321f13a64b18e942fbb95b882cad8..ff2c9a8eca9c62ceb7bf992fff3b3fd4205fb152 100644 (file)
--- a/libstdc++-v3/include/ext/rc_string_base.h
+++ b/libstdc++-v3/include/ext/rc_string_base.h
@@ -1,6 +1,6 @@
 // Reference-counted versatile string base -*- C++ -*-
 
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -515,7 +515,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
          }
        _Rep* __r = _Rep::_S_create(__len, size_type(0), __a);
        _S_copy(__r->_M_refdata(), __buf, __len);
-       try
+       __try
          {
            while (__beg != __end)
              {
@@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
                ++__beg;
              }
          }
-       catch(...)
+       __catch(...)
          {
            __r->_M_destroy(__a);
            __throw_exception_again;
@@ -559,9 +559,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
                                                                      __end));
        // Check for out_of_range and length_error exceptions.
        _Rep* __r = _Rep::_S_create(__dnew, size_type(0), __a);
-       try
+       __try
          { _S_copy_chars(__r->_M_refdata(), __beg, __end); }
-       catch(...)
+       __catch(...)
          {
            __r->_M_destroy(__a);
            __throw_exception_again;