From 70b5fa948d920ccca86d143057497132f63a44f3 Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Mon, 26 Mar 2018 15:15:40 -0700
Subject: Changes imported from Abseil "staging" branch:

  - f2c4c517f14afa7a3fac6b35588381462f02dec3 Rollback release of algorithm benchmark. by Alex Strelnikov <strel@google.com>
  - ec8a9569ac36d58a4fff2f9fc851e5a9474d274a Change AllocInspector to ConstructorTracker by Jon Cohen <cohenjon@google.com>
  - 6f94f3d65a29b11c692948d23c0fc530f015cd53 Update WORKSPACE for C++ microbenchmarks and release algo... by Alex Strelnikov <strel@google.com>
  - 79187dd7cec821e47cdd751db71bb23be2b8cef7 Define copy assignment operator for ThrowingAllocator. by Xiaoyi Zhang <zhangxy@google.com>
  - 8bf5e1048dd7788f4bce60376f5c3992f8525d88 Fix incorrect format string used in str_cat_test.cc code,... by Jorg Brown <jorg@google.com>
  - 19c51194e6638f05cbb364c6684f14dc7ed1a323 Fix symbolize_test under sanitizers. by Derek Mauro <dmauro@google.com>
  - d68119cfb845a9d460fc3fd4aae1d2ea7d79ee21 Internal change. by Derek Mauro <dmauro@google.com>
  - 4ca54d336c7a18050c95c6c1a859f2a0530e1cde Internal change. by Shaindel Schwartz <shaindel@google.com>

GitOrigin-RevId: f2c4c517f14afa7a3fac6b35588381462f02dec3
Change-Id: If61a65d65f03b26d6776710040780ddd1c52c4de
---
 absl/strings/str_cat_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'absl/strings/str_cat_test.cc')

diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc
index c5a3526d7a6a..58ab743ac13b 100644
--- a/absl/strings/str_cat_test.cc
+++ b/absl/strings/str_cat_test.cc
@@ -486,7 +486,7 @@ void CheckHexDec32(uint32_t uv) {
   if (sizeof(v) == sizeof(&v)) {
     auto uintptr = static_cast<uintptr_t>(v);
     void* ptr = reinterpret_cast<void*>(uintptr);
-    CheckHex(ptr, "%llx", "%0*llx", "%*llx");
+    CheckHex(ptr, "%x", "%0*x", "%*x");
   }
 }
 
-- 
cgit 1.4.1