LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File string-allocator.patch of Package gcc33 (Project openSUSE:Factory)

2004-06-09  Chavdar Botev  <cbotev@yahoo.com>

        PR libstdc++/14245
        * include/bits/basic_string.tcc
        (basic_string::basic_string(const basic_string&)): Pass to
        _Rep::_M_grab the actual allocator of the string being constructed
        not the default constructed one.

diff -urN libstdc++-v3-vanilla/include/bits/basic_string.tcc libstdc++-v3/include/bits/basic_string.tcc
--- libstdc++-v3-vanilla/include/bits/basic_string.tcc	2004-06-09 14:24:07.000000000 +0200
+++ libstdc++-v3/include/bits/basic_string.tcc	2004-06-08 00:03:51.000000000 +0200
@@ -1,6 +1,6 @@
 // Components for manipulating sequences of characters -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -189,8 +189,9 @@
   template<typename _CharT, typename _Traits, typename _Alloc>
     basic_string<_CharT, _Traits, _Alloc>::
     basic_string(const basic_string& __str)
-    : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(), __str.get_allocator()),
-		 __str.get_allocator())
+    : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(__str.get_allocator()),
+					  __str.get_allocator()),
+		  __str.get_allocator())
     { }
 
   template<typename _CharT, typename _Traits, typename _Alloc>