Re: [eigen] Add placement delete to match placement new

[ Thread Index | Date Index | More lists.tuxfamily.org/eigen Archives ]


hm actually I think Benoit did it ;) My name appeared because it's me
who applied your patch the first time but it is also me who forgot to
backport it ! So thank you Benoit :)


On Fri, Jul 31, 2009 at 9:22 AM, Hauke
Heibel<hauke.heibel@xxxxxxxxxxxxxx> wrote:
> Special thanks to Gael for actually performing the backport. On my
> system it even failed when exactly following Benoit's description -
> also on clean repos. Since I am currently extremely busy I couldn't
> find the time to dig into it. So once again - thank you Gael.
>
> Regards,
> Hauke
>
> On Mon, Jul 27, 2009 at 11:28 AM, Benoit Jacob<jacob.benoit.1@xxxxxxxxx> wrote:
>> Here, the following works:
>>
>> hg up 2.0
>> hg import diff
>>
>> Anyway, you may prefer to do the merging yourself. The changeset to be
>> merged is 40ae3cf84f3d84c117658c3a0f48669b2b69eeb4.
>>
>> hg up default
>> hg export 40ae3cf84f3d84c117658c3a0f48669b2b69eeb4 > diff
>> hg up 2.0
>> hg import diff
>>
>> By the way, it seems that we also need then to backport
>> 8622327a2d2ae43e11bf81e805e9abe1464c6c58.
>> Indeed, this commit went soon after the other one and affects the same code.
>>
>> Benoit
>>
>> 2009/7/27 Hauke Heibel <hauke.heibel@xxxxxxxxxxxxxx>:
>>> Somehow I failed to apply the patch.
>>>
>>> I did the following...
>>>
>>> hg up 2.0
>>> hg qimport diff
>>> cd .hg/patches
>>> hg qpush diff
>>>
>>> and got this output.
>>>
>>> (working directory not at tip)
>>> applying mem.diff
>>> patching file Eigen/src/Core/util/Memory.h
>>> Hunk #1 FAILED at 238
>>> 1 out of 1 hunks FAILED -- saving rejects to file
>>> Eigen/src/Core/util/Memory.h.rej
>>> patch failed to apply
>>> calling hook pretxncommit.crlf: hgext.win32text.forbidcrlf
>>> patch failed, rejects left in working dir
>>> errors during apply, please fix and refresh mem.diff
>>>
>>> No clue, what I am doing wrong and the patch seems to be ok. So right
>>> now, I cannot run the tests...
>>>
>>>
>>> On Mon, Jul 27, 2009 at 10:28 AM, Benoit Jacob<jacob.benoit.1@xxxxxxxxx> wrote:
>>>> Indeed, Hauke fixed this on May 7, along with many other issues.
>>>>
>>>> Somehow this wasn't backported, and I don't remember anymore if there
>>>> was a good reason not to.
>>>>
>>>> I merged this changeset to the 2.0 branch, it seems to work, attached
>>>> is the resulting patch. I can't test at the moment, but if tests work
>>>> I see no reason not to backport?
>>>>
>>>> Benoit
>>>
>>>
>>>
>>
>>
>>
>
>
>



-- 
Gaël Guennebaud
Iparla - INRIA Bordeaux
(+33)5 40 00 37 95



Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/