diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2012-04-14 09:04:57 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2012-04-14 09:04:57 +0000 |
| commit | 164dfb094df947db2117c182ae033ea85c6c42a1 (patch) | |
| tree | b18f80ec7015803e302c076feb4abdc986228abb /include | |
| parent | bba23ed672c4cedd61a302497f45bf6f53fec7b2 (diff) | |
| download | external_llvm-164dfb094df947db2117c182ae033ea85c6c42a1.zip external_llvm-164dfb094df947db2117c182ae033ea85c6c42a1.tar.gz external_llvm-164dfb094df947db2117c182ae033ea85c6c42a1.tar.bz2 | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/ADT/StringMap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 097418e..b4497a2 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<unsigned>(sizeof(MapEntryTy))), Allocator(A) {} - explicit StringMap(const StringMap &RHS) + StringMap(const StringMap &RHS) : StringMapImpl(static_cast<unsigned>(sizeof(MapEntryTy))) { assert(RHS.empty() && "Copy ctor from non-empty stringmap not implemented yet!"); |