commit 70f968d06a65d4688c2972bf13ed2c0f66203d17
author swift-ci <swift-ci@users.noreply.github.com> Tue Sep 27 20:55:17 2016 -0700
committer swift-ci <swift-ci@users.noreply.github.com> Tue Sep 27 20:55:17 2016 -0700
tree aa2e4b27c41368db0d06e44e7589bf96f2362d13
parent 16de52ab646f96bf2fab036837026a8f0e73fd86
parent c9be461d8a2832e9307d104eb62239397b3ba9c0

Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  [API Notes] Use std::make_tuple to unbreak libstdc++ build.

lib/APINotes/APINotesWriter.cpp

diff --git a/lib/APINotes/APINotesWriter.cpp b/lib/APINotes/APINotesWriter.cpp
index 0e0bfaf..b0a4650 100644
--- a/lib/APINotes/APINotesWriter.cpp
+++ b/lib/APINotes/APINotesWriter.cpp
@@ -1066,8 +1066,8 @@
                                      bool isInstance,
                                      const ObjCPropertyInfo &info) {
   IdentifierID nameID = Impl.getIdentifier(name);
-  assert(!Impl.ObjCProperties.count({contextID.Value, nameID, isInstance}));
-  Impl.ObjCProperties[{contextID.Value, nameID, isInstance}] = info;
+  assert(!Impl.ObjCProperties.count(std::make_tuple(contextID.Value, nameID, isInstance)));
+  Impl.ObjCProperties[std::make_tuple(contextID.Value, nameID, isInstance)] = info;
 }
 
 void APINotesWriter::addObjCMethod(ContextID contextID,