2009-12-10 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.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 82c614c..6d8c430 100644 (file)
--- a/libstdc++-v3/include/ext/rc_string_base.h
+++ b/libstdc++-v3/include/ext/rc_string_base.h
@@ -1,11 +1,11 @@
 // 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
 // terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -13,19 +13,14 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
 
 /** @file ext/rc_string_base.h
  *  This file is a GNU extension to the Standard C++ Library.
@@ -309,9 +304,6 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       __rc_string_base(__rc_string_base&& __rcs)
       : _M_dataplus(__rcs._M_get_allocator(), __rcs._M_data())
       { __rcs._M_data(_S_empty_rep._M_refcopy()); }
-
-      __rc_string_base(std::initializer_list<_CharT> __l, const _Alloc& __a)
-      : _M_dataplus(__a, _S_construct(__l.begin(), __l.end(), __a)) { }
 #endif
 
       __rc_string_base(size_type __n, _CharT __c, const _Alloc& __a);
@@ -518,7 +510,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)
              {
@@ -534,7 +526,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
                ++__beg;
              }
          }
-       catch(...)
+       __catch(...)
          {
            __r->_M_destroy(__a);
            __throw_exception_again;
@@ -554,7 +546,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
          return _S_empty_rep._M_refcopy();
 
        // NB: Not required, but considered best practice.
-       if (__builtin_expect(__is_null_pointer(__beg) && __beg != __end, 0))
+       if (__is_null_pointer(__beg) && __beg != __end)
          std::__throw_logic_error(__N("__rc_string_base::"
                                       "_S_construct NULL not valid"));
 
@@ -562,9 +554,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;