Re: [patch] Make vector::at() assertion message more useful (try #2)

[Paul Pluzhnikov <ppluzhnikov@google.com>]

On 9/23/13 9:24 AM, Paolo Carlini wrote:

>> Does this look right?
> Yes. Nit, in the comment I would also explicitly mention locale-inst.cc.

Done, submitted as r202836.

2013-09-23  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* src/c++11/snprintf_lite.cc (__concat_size_t): Use
	unsigned long long conditionally.



Index: libstdc++-v3/src/c++11/snprintf_lite.cc
===================================================================
--- libstdc++-v3/src/c++11/snprintf_lite.cc	(revision 202832)
+++ libstdc++-v3/src/c++11/snprintf_lite.cc	(working copy)
@@ -69,11 +69,17 @@
    // Returns number of characters appended, or -1 if BUFSIZE is too small.
    int __concat_size_t(char *__buf, size_t __bufsize, size_t __val)
    {
+    // __int_to_char is explicitly instantiated and available only for
+    // some, but not all, types. See locale-inst.cc.
+#ifdef _GLIBCXX_USE_LONG_LONG
+    unsigned long long __val2 = __val;
+#else
+    unsigned long __val2 = __val;
+#endif
      // Long enough for decimal representation.
-    unsigned long long __val_ull = __val;
-    int __ilen = 3 * sizeof(__val_ull);
+    int __ilen = 3 * sizeof(__val2);
      char *__cs = static_cast<char*>(__builtin_alloca(__ilen));
-    size_t __len = std::__int_to_char(__cs + __ilen, __val_ull,
+    size_t __len = std::__int_to_char(__cs + __ilen, __val2,
  				      std::__num_base::_S_atoms_out,
  				      std::ios_base::dec, true);
      if (__bufsize < __len)