Remove lambda expression in (pretty)writertest

Tencent · Sep 21, 2016 · 0761ac1 · 0761ac1
1 parent f28203c
commit 0761ac1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/test/unittest/prettywritertest.cpp b/test/unittest/prettywritertest.cpp
@@ -208,17 +208,18 @@ TEST(PrettyWriter, RawValue) {
 }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+static PrettyWriter<StringBuffer> WriterGen(StringBuffer &target) {
+    PrettyWriter<StringBuffer> writer(target);
+    writer.StartObject();
+    writer.Key("a");
+    writer.Int(1);
+    return std::move(writer);
+}
+
 TEST(PrettyWriter, MoveCtor) {
     StringBuffer buffer;
-    auto writerGen=[](StringBuffer &target) -> PrettyWriter<StringBuffer> {
-        PrettyWriter<StringBuffer> writer(target);
-        writer.StartObject();
-        writer.Key("a");
-        writer.Int(1);
-        return std::move(writer);
-    };
-
-    PrettyWriter<StringBuffer> writer(writerGen(buffer));
+    PrettyWriter<StringBuffer> writer(WriterGen(buffer));
     writer.EndObject();
     EXPECT_TRUE(writer.IsComplete());
     EXPECT_STREQ(

diff --git a/test/unittest/writertest.cpp b/test/unittest/writertest.cpp
@@ -502,17 +502,17 @@ TEST(Writer, RawValue) {
 }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+static Writer<StringBuffer> WriterGen(StringBuffer &target) {
+    Writer<StringBuffer> writer(target);
+    writer.StartObject();
+    writer.Key("a");
+    writer.Int(1);
+    return std::move(writer);
+}
+
 TEST(Writer, MoveCtor) {
     StringBuffer buffer;
-    auto writerGen=[](StringBuffer &target) -> Writer<StringBuffer> {
-        Writer<StringBuffer> writer(target);
-        writer.StartObject();
-        writer.Key("a");
-        writer.Int(1);
-        return std::move(writer);
-    };
-
-    Writer<StringBuffer> writer(writerGen(buffer));
+    Writer<StringBuffer> writer(WriterGen(buffer));
     writer.EndObject();
     EXPECT_TRUE(writer.IsComplete());
     EXPECT_STREQ("{\"a\":1}", buffer.GetString());