merge from gcc
This commit is contained in:
parent
191c4426c1
commit
4e55d6c3ee
2 changed files with 10 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
2009-05-19 Ian Lance Taylor <iant@google.com>
|
||||
Ben Elliston <bje@au.ibm.com>
|
||||
|
||||
* cp-demangle.c (cplus_demangle_fill_ctor): Fix logic bug.
|
||||
(cplus_demangle_fill_dtor): Likewise.
|
||||
|
||||
2009-05-17 Julian Brown <julian@codesourcery.com>
|
||||
|
||||
* pex-win32.c (pex_win32_exec_child): Fix logic to avoid closing
|
||||
|
|
|
@ -719,8 +719,8 @@ cplus_demangle_fill_ctor (struct demangle_component *p,
|
|||
{
|
||||
if (p == NULL
|
||||
|| name == NULL
|
||||
|| (kind < gnu_v3_complete_object_ctor
|
||||
&& kind > gnu_v3_complete_object_allocating_ctor))
|
||||
|| (int) kind < gnu_v3_complete_object_ctor
|
||||
|| (int) kind > gnu_v3_complete_object_allocating_ctor)
|
||||
return 0;
|
||||
p->type = DEMANGLE_COMPONENT_CTOR;
|
||||
p->u.s_ctor.kind = kind;
|
||||
|
@ -738,8 +738,8 @@ cplus_demangle_fill_dtor (struct demangle_component *p,
|
|||
{
|
||||
if (p == NULL
|
||||
|| name == NULL
|
||||
|| (kind < gnu_v3_deleting_dtor
|
||||
&& kind > gnu_v3_base_object_dtor))
|
||||
|| (int) kind < gnu_v3_deleting_dtor
|
||||
|| (int) kind > gnu_v3_base_object_dtor)
|
||||
return 0;
|
||||
p->type = DEMANGLE_COMPONENT_DTOR;
|
||||
p->u.s_dtor.kind = kind;
|
||||
|
|
Loading…
Reference in a new issue