heap: merge fix from trunk
authortimblechmann <timblechmann@b8fc166d-592f-0410-95f2-cb63ce0dd405>
Tue, 7 Feb 2012 18:52:13 +0000 (18:52 +0000)
committertimblechmann <timblechmann@b8fc166d-592f-0410-95f2-cb63ce0dd405>
Tue, 7 Feb 2012 18:52:13 +0000 (18:52 +0000)
commita38c72036b69df0f7531de8404bdeeacb5eee43f
tree5a703d392d83a1b2b20f0f15c5f7defac23aa54c
parent17cb535570125efbd77951bb860c18829eab87af
heap: merge fix from trunk

git-svn-id: http://svn.boost.org/svn/boost/branches/release@76938 b8fc166d-592f-0410-95f2-cb63ce0dd405
boost/heap/heap_merge.hpp