From 2fe174b7af0c4b2706077d658c6039e509cabb4d Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Sun, 15 May 2016 11:47:20 +0200 Subject: [PATCH] Fix compile clang3.8: Moving temp objects prevents copy elision --- alib2algo/src/tree/generate/RandomTreeFactory.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alib2algo/src/tree/generate/RandomTreeFactory.cpp b/alib2algo/src/tree/generate/RandomTreeFactory.cpp index 4ae101b37f..0f986bddd7 100644 --- a/alib2algo/src/tree/generate/RandomTreeFactory.cpp +++ b/alib2algo/src/tree/generate/RandomTreeFactory.cpp @@ -274,7 +274,7 @@ UnrankedTree RandomTreeFactory::generateUnrankedTree ( int depth, int nodesCount for ( std::vector < char >::const_iterator it = alphabet.begin ( ); it != alphabet.end ( ); ++it ) treeAlphabet.insert ( alphabet::symbolFrom ( * it ) ); - UnrankedTree tree ( treeAlphabet, std::move ( root->createUnrankedNode ( ) ) ); + UnrankedTree tree ( treeAlphabet, root->createUnrankedNode ( ) ); delete root; return tree; } @@ -292,7 +292,7 @@ UnrankedPattern RandomTreeFactory::generateUnrankedPattern ( int depth, int node alphabet::Symbol subtreeWildcard ( alphabet::SubtreeWildcardSymbol::SUBTREE_WILDCARD ); treeAlphabet.insert ( subtreeWildcard ); - UnrankedPattern tree ( std::move ( subtreeWildcard ), treeAlphabet, std::move ( root->createUnrankedPatternNode ( ) ) ); + UnrankedPattern tree ( std::move ( subtreeWildcard ), treeAlphabet, root->createUnrankedPatternNode ( ) ); delete root; return tree; } @@ -314,7 +314,7 @@ RankedTree RandomTreeFactory::generateRankedTree ( int depth, int nodesCount, in treeRankedAlphabet.insert ( alphabet::RankedSymbol ( * i, it->first ) ); } - RankedTree tree ( treeRankedAlphabet, std::move ( root->createRankedNode ( ) ) ); + RankedTree tree ( treeRankedAlphabet, root->createRankedNode ( ) ); delete root; return tree; } @@ -338,7 +338,7 @@ RankedPattern RandomTreeFactory::generateRankedPattern ( int depth, int nodesCou alphabet::RankedSymbol subtreeWildcard ( alphabet::Symbol ( alphabet::SubtreeWildcardSymbol::SUBTREE_WILDCARD ), 0 ); treeRankedAlphabet.insert ( subtreeWildcard ); - RankedPattern tree ( std::move ( subtreeWildcard ), treeRankedAlphabet, std::move ( root->createRankedPatternNode ( ) ) ); + RankedPattern tree ( std::move ( subtreeWildcard ), treeRankedAlphabet, root->createRankedPatternNode ( ) ); delete root; return tree; } -- GitLab