| Re: [eigen] Add placement delete to match placement new |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/eigen Archives
]
- To: eigen@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [eigen] Add placement delete to match placement new
- From: Benoit Jacob <jacob.benoit.1@xxxxxxxxx>
- Date: Mon, 27 Jul 2009 11:28:48 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=giN6SpOlpJsIyLCW1B7+W5b+njXzqwhAZjHs++4hYh0=; b=eakQyTQySfq1vORedfpsLaincBnneRgoF8DnEywl3d2MxJmHZUB+2WWeFk+nrSNedd JqhrY7VyU43Kf29oy5glJ3C3CieNa8zQ8+mAl+xPVNdqtESMopZZoiAfjdDQ5HhFlVXY uSZpAj5z3+BiU3KhLKwPdTVZuGgxXCwvwJlgw=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=XeIeH6riXmTRptBEW4+f9iAmPTfk4vvVXg2B2dfO2Ds84ndgl5ETrDufAROZvI65f9 awuvdTeCa3OxVCw6ph1Cqb9JtqxIr7oyZSXCAHC0CjSONBjjYAG7hey87j44QE2kHS5w 6BtUgx9LPCWhEHKrtHDaRFgiqyREndz4SPqxI=
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
>
>
>