From 164dfb094df947db2117c182ae033ea85c6c42a1 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 14 Apr 2012 09:04:57 +0000 Subject: [PATCH] Make StringMap's copy ctor non-explicit. Without this gcc doesn't allow us to put a StringMap into a std::map. Works with clang though. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154737 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/StringMap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 097418efc81..b4497a276d0 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -239,7 +239,7 @@ public: explicit StringMap(AllocatorTy A) : StringMapImpl(static_cast(sizeof(MapEntryTy))), Allocator(A) {} - explicit StringMap(const StringMap &RHS) + StringMap(const StringMap &RHS) : StringMapImpl(static_cast(sizeof(MapEntryTy))) { assert(RHS.empty() && "Copy ctor from non-empty stringmap not implemented yet!");