From 0c5219a1d652da43fd9be235394f2e49f85b0923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Thu, 12 Jan 2017 21:19:04 +0100
Subject: [PATCH] Restore missing symbol _ZN7BStringixEi on x86 and x86_64.

* Vision and others were broken after 3eac8208dfcd6bd73a534303414784d3754de855.
* this adds BStringRef in the backward compatibility section.
* fixes #13199.
---
 headers/os/support/String.h |  1 +
 src/kits/support/String.cpp | 82 +++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/headers/os/support/String.h b/headers/os/support/String.h
index 7471d52bae..2930b2cc7b 100644
--- a/headers/os/support/String.h
+++ b/headers/os/support/String.h
@@ -352,6 +352,7 @@ public:
 
 private:
 			class PosVect;
+			friend class BStringRef;
 
 			enum PrivateDataTag {
 				PRIVATE_DATA
diff --git a/src/kits/support/String.cpp b/src/kits/support/String.cpp
index c59bb3f1c4..70a8b370d8 100644
--- a/src/kits/support/String.cpp
+++ b/src/kits/support/String.cpp
@@ -2658,6 +2658,88 @@ __ls__7BStringR7BString(BString* self, BString& string)
 }
 
 
+#if __GNUC__ > 3
+
+//	#pragma mark - BStringRef backwards compatibility
+
+
+class BStringRef {
+public:
+	BStringRef(BString& string, int32 position);
+	~BStringRef() {}
+
+	operator char() const;
+
+	char* operator&();
+	const char* operator&() const;
+
+	BStringRef& operator=(char c);
+	BStringRef& operator=(const BStringRef& rc);
+
+private:
+	BString&	fString;
+	int32		fPosition;
+};
+
+
+BStringRef::BStringRef(BString& string, int32 position)
+	:
+	fString(string), fPosition(position)
+{
+}
+
+
+BStringRef::operator char() const
+{
+	return fPosition < fString.Length() ? fString.fPrivateData[fPosition] : 0;
+}
+
+
+BStringRef&
+BStringRef::operator=(char c)
+{
+	fString._MakeWritable();
+	fString.fPrivateData[fPosition] = c;
+	return *this;
+}
+
+
+BStringRef&
+BStringRef::operator=(const BStringRef &rc)
+{
+	return operator=(rc.fString.fPrivateData[rc.fPosition]);
+}
+
+
+const char*
+BStringRef::operator&() const
+{
+	return &fString.fPrivateData[fPosition];
+}
+
+
+char*
+BStringRef::operator&()
+{
+	if (fString._MakeWritable() != B_OK)
+		return NULL;
+
+	fString._ReferenceCount() = -1;
+		// mark as unsharable
+	return &fString.fPrivateData[fPosition];
+}
+
+
+
+extern "C" BStringRef
+_ZN7BStringixEi(BString* self, int32 index)
+
+{
+	return BStringRef(*self, index);
+}
+#endif
+
+
 //	#pragma mark - Non-member compare for sorting, etc.