commit 46a4481f10a01c428fc50564cdd95c7e7c7b0cdc
author NAKAMURA Takumi <geek4civic@gmail.com> Wed Nov 19 12:28:08 2014 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Wed Nov 19 12:28:08 2014 +0000
tree a441394a2abd58991aab7ff8d497546ab8984c95
parent 12de08b45ff2bedbee0e2221d38101343b262ce6

Update for LLVM API change to make Small(Ptr)Set::insert return pair<iterator, bool> as per the C++ standard's associative container concept.

llvm-svn: 222350

dragonegg/src/Convert.cpp

diff --git a/dragonegg/src/Convert.cpp b/dragonegg/src/Convert.cpp
index 38b707f..3be0080 100644
--- a/dragonegg/src/Convert.cpp
+++ b/dragonegg/src/Convert.cpp
@@ -2704,7 +2704,7 @@
             for (tree type = c->type_list; type; type = TREE_CHAIN(type)) {
               Constant *TypeInfo = ConvertTypeInfo(TREE_VALUE(type));
               // No point in trying to catch a typeinfo that was already caught.
-              if (!AlreadyCaught.insert(TypeInfo))
+              if (!AlreadyCaught.insert(TypeInfo).second)
                 continue;
               LPadInst->addClause(TypeInfo);
             }
@@ -8798,7 +8798,7 @@
           for (tree type = c->type_list; type; type = TREE_CHAIN(type)) {
             Value *TypeInfo = ConvertTypeInfo(TREE_VALUE(type));
             // No point in trying to catch a typeinfo that was already caught.
-            if (!AlreadyCaught.insert(TypeInfo))
+            if (!AlreadyCaught.insert(TypeInfo).second)
               continue;
 
             TypeInfo = Builder.CreateBitCast(TypeInfo, Builder.getInt8PtrTy());