From: Alexey Spiridonov <lesha@fb.com>
Date: Wed, 18 Mar 2015 06:27:55 +0000 (-0700)
Subject: Fix logFormat
X-Git-Tag: v0.32.0~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=816b97a7f02a564496b63252642acea109b38360;p=folly.git

Fix logFormat

Summary: Ooops during port ;)

Test Plan: unit test

Reviewed By: agoder@fb.com

Subscribers: trunkagent, folly-diffs@, yfeldblum

FB internal diff: D1905639

Signature: t1:1905639:1426171227:a6e415046a85f098ac090f069476204fb0367c42
---

diff --git a/folly/experimental/AutoTimer.h b/folly/experimental/AutoTimer.h
index dfe2bcfe..fb2b033b 100644
--- a/folly/experimental/AutoTimer.h
+++ b/folly/experimental/AutoTimer.h
@@ -94,7 +94,7 @@ public:
   template<typename... Args>
   double logFormat(Args&&... args) {
     auto now = Clock::now();
-    return logImpl(now, format(std::forward<Args>(args)...));
+    return logImpl(now, format(std::forward<Args>(args)...).str());
   }
 
 private:
diff --git a/folly/experimental/test/AutoTimerTest.cpp b/folly/experimental/test/AutoTimerTest.cpp
index bb232395..b5b0b2a3 100644
--- a/folly/experimental/test/AutoTimerTest.cpp
+++ b/folly/experimental/test/AutoTimerTest.cpp
@@ -50,6 +50,9 @@ TEST(TestAutoTimer, HandleBasic) {
   timer.log("foo");
   ASSERT_EQ("foo", StubLogger::m);
   ASSERT_EQ(2, StubLogger::t);
+  timer.logFormat("bar {}", 5e-2);
+  ASSERT_EQ("bar 0.05", StubLogger::m);
+  ASSERT_EQ(0, StubLogger::t);
 }
 
 TEST(TestAutoTimer, HandleLogOnDestruct) {