From c9c456866a6cd7ae52739c35766c4f1349a01676 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 16 Oct 2006 09:51:14 +0000
Subject: [PATCH] * include/bits/basic_string.tcc (_Rep::_S_create):
Call _M_set_sharable() for backwards compatibility.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117777 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/include/bits/basic_string.tcc | 8 ++++++++
2 files changed, 13 insertions(+)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0fa59dd3debe..0aed5e0f8a74 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16 Jakub Jelinek <jakub@redhat.com>
+
+ * include/bits/basic_string.tcc (_Rep::_S_create): Call
+ _M_set_sharable() for backwards compatibility.
+
2006-10-15 Paolo Carlini <pcarlini@suse.de>
* include/bits/istream.tcc (getline(basic_istream<>&,
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 4cf5f29ad36d..fadf9b34ea13 100644
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -588,6 +588,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
void* __place = _Raw_bytes_alloc(__alloc).allocate(__size);
_Rep *__p = new (__place) _Rep;
__p->_M_capacity = __capacity;
+ // ABI compatibility - 3.4.x set in _S_create both
+ // _M_refcount and _M_length. All callers of _S_create
+ // in basic_string.tcc then set just _M_length.
+ // In 4.0.x and later both _M_refcount and _M_length
+ // are initialized in the callers, unfortunately we can
+ // have 3.4.x compiled code with _S_create callers inlined
+ // calling 4.0.x+ _S_create.
+ __p->_M_set_sharable();
return __p;
}
--
GitLab