From: Scott Worley Date: Sun, 3 Jan 2016 20:28:48 +0000 (-0800) Subject: Use make_shared X-Git-Url: http://git.scottworley.com/slidingtile/commitdiff_plain/f548f940f95af83b788abf75625d5a5e7fe5617c?ds=sidebyside;hp=49358f3664c36c346dba758ae1b7da9106c42e3b Use make_shared --- diff --git a/sliding_tile_lib_test.cc b/sliding_tile_lib_test.cc index d57c7a4..8e6cb89 100644 --- a/sliding_tile_lib_test.cc +++ b/sliding_tile_lib_test.cc @@ -121,7 +121,7 @@ TEST(Board, MaxDistance) { } TEST(Step, TwoSuccessors) { - auto s = std::shared_ptr(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr}); + auto s = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, nullptr}); std::vector suc = s->successors(s); EXPECT_THAT(suc, testing::UnorderedElementsAre( Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}))), @@ -129,7 +129,7 @@ TEST(Step, TwoSuccessors) { } TEST(Step, FourSuccessors) { - auto s = std::shared_ptr(new Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr}); + auto s = std::make_shared(Step{{{1,2,3,4,5,0,6,7,8,9,10,11,12,13,14,15}}, nullptr}); std::vector suc = s->successors(s); EXPECT_THAT(suc, testing::UnorderedElementsAre( Field(&Step::board, Field(&Board::board, ElementsAreArray({1,2,3,4,0,5,6,7,8,9,10,11,12,13,14,15}))), @@ -139,13 +139,13 @@ TEST(Step, FourSuccessors) { } TEST(Step, Output) { - auto s1 = std::shared_ptr(new Step{{{1,2,3,4,5,7,11,8,9,6,0,12,13,10,14,15}}, nullptr}); - auto s2 = std::shared_ptr(new Step{{{1,2,3,4,5,7,0,8,9,6,11,12,13,10,14,15}}, s1}); - auto s3 = std::shared_ptr(new Step{{{1,2,3,4,5,0,7,8,9,6,11,12,13,10,14,15}}, s2}); - auto s4 = std::shared_ptr(new Step{{{1,2,3,4,5,6,7,8,9,0,11,12,13,10,14,15}}, s3}); - auto s5 = std::shared_ptr(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,0,14,15}}, s4}); - auto s6 = std::shared_ptr(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}}, s5}); - auto s7 = std::shared_ptr(new Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, s6}); + auto s1 = std::make_shared(Step{{{1,2,3,4,5,7,11,8,9,6,0,12,13,10,14,15}}, nullptr}); + auto s2 = std::make_shared(Step{{{1,2,3,4,5,7,0,8,9,6,11,12,13,10,14,15}}, s1}); + auto s3 = std::make_shared(Step{{{1,2,3,4,5,0,7,8,9,6,11,12,13,10,14,15}}, s2}); + auto s4 = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,0,11,12,13,10,14,15}}, s3}); + auto s5 = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,0,14,15}}, s4}); + auto s6 = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,0,15}}, s5}); + auto s7 = std::make_shared(Step{{{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0}}, s6}); std::ostringstream actual; actual << *s7; std::ostringstream expected;