summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2016-07-27 18:25:12 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2016-07-27 18:25:12 +0000
commit22039e68582aa62fba4c9d6da08462b34d3996a9 (patch)
treea16c33755e80d3e35af392a9b9614fd90d45ddea
parent3cdc317342d8c2b36de2839ea6ebefec17cb271e (diff)
downloadbcm5719-llvm-22039e68582aa62fba4c9d6da08462b34d3996a9.tar.gz
bcm5719-llvm-22039e68582aa62fba4c9d6da08462b34d3996a9.zip
Fix the build for libstdc++ 4.7
libstdc++ 4.7 doesn't have emplace. Use std::map::insert instead. llvm-svn: 276901
-rw-r--r--llvm/include/llvm/Analysis/RegionInfoImpl.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/include/llvm/Analysis/RegionInfoImpl.h b/llvm/include/llvm/Analysis/RegionInfoImpl.h
index bf4763ece30..a16c534484b 100644
--- a/llvm/include/llvm/Analysis/RegionInfoImpl.h
+++ b/llvm/include/llvm/Analysis/RegionInfoImpl.h
@@ -329,10 +329,9 @@ typename Tr::RegionNodeT *RegionBase<Tr>::getBBNode(BlockT *BB) const {
if (at == BBNodeMap.end()) {
auto Deconst = const_cast<RegionBase<Tr> *>(this);
- at = BBNodeMap
- .emplace(BB, make_unique<RegionNodeT>(
- static_cast<RegionT *>(Deconst), BB))
- .first;
+ typename BBNodeMapT::value_type V = {
+ BB, make_unique<RegionNodeT>(static_cast<RegionT *>(Deconst), BB)};
+ at = BBNodeMap.insert(std::move(V)).first;
}
return at->second.get();
}
OpenPOWER on IntegriCloud