⛏️ index : buildtools.git

66becd8fe7e99054b190c181b063933310718179 [patch]

bbc3b720fdd93549249f34e80f18577d6f283a28

b8e7021a67835fdfcf9e9a321d334878892baf06

9bfca2f40f0857932e8bc66b6d1fdae94acf8d9c

66becd8fe7e99054b190c181b063933310718179.tar.gz

Merge btrev43068 instead of rebasing and resolving conflicts.

Diff

 legacy/gcc/libstdc++/std/bastring.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/legacy/gcc/libstdc++/std/bastring.h b/legacy/gcc/libstdc++/std/bastring.h
index a9c844d..c60e4d7 100644
--- a/legacy/gcc/libstdc++/std/bastring.h
+++ b/legacy/gcc/libstdc++/std/bastring.h
@@ -66,7 +66,7 @@
#endif

#ifdef __HAIKU__
extern "C" __haiku_int32 atomic_add(volatile __haiku_int32* value,
extern "C" __haiku_int32 atomic_add(__haiku_int32* value,
	__haiku_int32 addvalue);
#endif	/* __HAIKU__ */

@@ -82,7 +82,7 @@
    charT* data () { return reinterpret_cast<charT *>(this + 1); }
    charT& operator[] (size_t s) { return data () [s]; }
#ifdef __HAIKU__
    charT* grab () { if (selfish) return clone (); atomic_add((volatile __haiku_int32*) &ref, 1); return data (); }
    charT* grab () { if (selfish) return clone (); atomic_add((__haiku_int32*) &ref, 1); return data (); }
    void release() { if (atomic_add((__haiku_int32*) &ref, -1) == 1) delete this; }
#else
    charT* grab () { if (selfish) return clone (); ++ref; return data (); }