From 0761ac126b1aa2144a26c26dfde1c08073eda43a Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Wed, 21 Sep 2016 21:49:49 +0800 Subject: [PATCH] Remove lambda expression in (pretty)writertest --- test/unittest/prettywritertest.cpp | 19 ++++++++++--------- test/unittest/writertest.cpp | 18 +++++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/test/unittest/prettywritertest.cpp b/test/unittest/prettywritertest.cpp index 1700c0c..42ff3f2 100644 --- 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 WriterGen(StringBuffer &target) { + PrettyWriter writer(target); + writer.StartObject(); + writer.Key("a"); + writer.Int(1); + return std::move(writer); +} + TEST(PrettyWriter, MoveCtor) { StringBuffer buffer; - auto writerGen=[](StringBuffer &target) -> PrettyWriter { - PrettyWriter writer(target); - writer.StartObject(); - writer.Key("a"); - writer.Int(1); - return std::move(writer); - }; - - PrettyWriter writer(writerGen(buffer)); + PrettyWriter writer(WriterGen(buffer)); writer.EndObject(); EXPECT_TRUE(writer.IsComplete()); EXPECT_STREQ( diff --git a/test/unittest/writertest.cpp b/test/unittest/writertest.cpp index b3124bf..feb4d74 100644 --- 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 WriterGen(StringBuffer &target) { + Writer writer(target); + writer.StartObject(); + writer.Key("a"); + writer.Int(1); + return std::move(writer); +} + TEST(Writer, MoveCtor) { StringBuffer buffer; - auto writerGen=[](StringBuffer &target) -> Writer { - Writer writer(target); - writer.StartObject(); - writer.Key("a"); - writer.Int(1); - return std::move(writer); - }; - - Writer writer(writerGen(buffer)); + Writer writer(WriterGen(buffer)); writer.EndObject(); EXPECT_TRUE(writer.IsComplete()); EXPECT_STREQ("{\"a\":1}", buffer.GetString());