Attachment 301764 Details for Bug 441639 – Apply upstream fix for GCC PR29217

[patch] Apply upstream fix for GCC PR29217

gcc41-pr29217.patch (text/plain), 1.10 KB, created by Andrew Mann on 2008-04-09 09:14:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Mann

Created: 2008-04-09 09:14:37 UTC

Size: 1.10 KB

patch

obsolete

>--- libstdc++-v3/src/localename.cc	2008-04-08 01:05:45.000000000 -0400
>+++ libstdc++-v3/src/localename.cc	2008-04-08 01:08:32.000000000 -0400
>@@ -288,13 +288,23 @@
> 			std::memcpy(_M_names[__i], _M_names[0], __len);
> 		      }
> 		  }
>-		char* __src = __imp->_M_names[__ix] ? __imp->_M_names[__ix]
>-		                                    : __imp->_M_names[0];
>+
>+		// FIXME: Hack for libstdc++/29217: the numerical encodings
>+		// of the time and collate categories are swapped vs the
>+		// order of the names in locale::_S_categories.  We'd like to
>+		// adjust the former (the latter is dictated by compatibility
>+		// with glibc) but we can't for binary compatibility.
>+		size_t __ix_name = __ix;
>+		if (__ix == 2 || __ix == 3)
>+		  __ix_name = 5 - __ix;
>+
>+		char* __src = __imp->_M_names[__ix_name] ?
>+			__imp->_M_names[__ix_name] : __imp->_M_names[0];
> 		const size_t __len = std::strlen(__src) + 1;
> 		char* __new = new char[__len];
> 		std::memcpy(__new, __src, __len);
>-		delete [] _M_names[__ix];
>-		_M_names[__ix] = __new;
>+		delete [] _M_names[__ix_name];
>+		_M_names[__ix_name] = __new;
> 	      }
> 	  }
>       }

Actions: View | Diff

Attachments on bug 441639: 301764