Licensing changes to GPLv3 resp. GPLv3 with GCC Runtime Exception.

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / tree.cc

diff --git a/libstdc++-v3/src/tree.cc b/libstdc++-v3/src/tree.cc
index 38a3037..c8ba935 100644 (file)
--- a/libstdc++-v3/src/tree.cc
+++ b/libstdc++-v3/src/tree.cc
@@ -1,11 +1,11 @@
 // RB tree utilities implementation -*- C++ -*-
 
-// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005, 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/>.
 
 /*
  *
@@ -316,17 +311,21 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
          else
            __z->_M_parent->_M_right = __x;
        if (__leftmost == __z) 
-         if (__z->_M_right == 0)        // __z->_M_left must be null also
-           __leftmost = __z->_M_parent;
-       // makes __leftmost == _M_header if __z == __root
-         else
-           __leftmost = _Rb_tree_node_base::_S_minimum(__x);
+         {
+           if (__z->_M_right == 0)        // __z->_M_left must be null also
+             __leftmost = __z->_M_parent;
+           // makes __leftmost == _M_header if __z == __root
+           else
+             __leftmost = _Rb_tree_node_base::_S_minimum(__x);
+         }
        if (__rightmost == __z)  
-         if (__z->_M_left == 0)         // __z->_M_right must be null also
-           __rightmost = __z->_M_parent;  
-       // makes __rightmost == _M_header if __z == __root
-         else                      // __x == __z->_M_left
-           __rightmost = _Rb_tree_node_base::_S_maximum(__x);
+         {
+           if (__z->_M_left == 0)         // __z->_M_right must be null also
+             __rightmost = __z->_M_parent;  
+           // makes __rightmost == _M_header if __z == __root
+           else                      // __x == __z->_M_left
+             __rightmost = _Rb_tree_node_base::_S_maximum(__x);
+         }
       }
     if (__y->_M_color != _S_red) 
       {