commit 6b1958c5ce57e642ffd561e55b95812d3a8d047e
author Hans Wennborg <hans@hanshq.net> Thu Aug 18 00:20:59 2016 +0000
committer Hans Wennborg <hans@hanshq.net> Thu Aug 18 00:20:59 2016 +0000
tree 373ab48d4cf791dbb0ad3ae9d65e6e74a5973674
parent 48fa196e7726284c2507df6763e698fba5e8230a

Merging r278904:
------------------------------------------------------------------------
r278904 | marshall | 2016-08-16 22:58:40 -0700 (Tue, 16 Aug 2016) | 1 line

Support allocators with explicit conversion constructors. Fixes bug #29000
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/branches/release_39@279015 91177308-0d34-0410-b5e6-96231b3b80d8