commit 5c2a5eaf11a8f5692bd61fbc1a3c74b907f814d4
author Hans Wennborg <hans@hanshq.net> Mon Aug 03 18:27:09 2015 +0000
committer Hans Wennborg <hans@hanshq.net> Mon Aug 03 18:27:09 2015 +0000
tree 208dfa3832f8201a229ba7bbd1510041046e2ce1
parent de4b4f0ccab26eae61334e6e7cfee474e91e66f5

Merging r243530 and r243641:
------------------------------------------------------------------------
r243530 | marshall | 2015-07-29 09:25:45 -0700 (Wed, 29 Jul 2015) | 1 line

Fix a self-move bug in inplace_merge. Thanks to Ted and Dexon for the report and the suggested fix.
------------------------------------------------------------------------

------------------------------------------------------------------------
r243641 | marshall | 2015-07-30 06:56:00 -0700 (Thu, 30 Jul 2015) | 1 line

Change some #ifdefs to #if - thanks to Dexon for thge catch.
------------------------------------------------------------------------


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