fix PR python/15816
This fixes PR python/15816. The bug here is that python-selftest.exp can fail: No symbol "RETURN_MASK_ALL" in current context. RETURN_MASK_ALL is a macro, so if macros do not end up in the debuginfo (very typical) then the test fails. It seemed simplest to me to simply turn the RETURN_MASK_ defines into enum constants. This way they end up in the debuginfo and all is well. PR python/15816: * exceptions.h (return_mask): Now an enum. (RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL): Now enum constants. Built and regtested on x86-64 Fedora 18.
This commit is contained in:
parent
df6d544176
commit
df30244622
|
@ -1,3 +1,10 @@
|
|||
2013-08-20 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
PR python/15816:
|
||||
* exceptions.h (return_mask): Now an enum.
|
||||
(RETURN_MASK_QUIT, RETURN_MASK_ERROR, RETURN_MASK_ALL): Now
|
||||
enum constants.
|
||||
|
||||
2013-08-20 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* cp-namespace.c (cp_lookup_symbol_imports_or_template): Use
|
||||
|
|
|
@ -38,10 +38,13 @@ enum return_reason
|
|||
};
|
||||
|
||||
#define RETURN_MASK(reason) (1 << (int)(-reason))
|
||||
#define RETURN_MASK_QUIT RETURN_MASK (RETURN_QUIT)
|
||||
#define RETURN_MASK_ERROR RETURN_MASK (RETURN_ERROR)
|
||||
#define RETURN_MASK_ALL (RETURN_MASK_QUIT | RETURN_MASK_ERROR)
|
||||
typedef int return_mask;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
RETURN_MASK_QUIT = RETURN_MASK (RETURN_QUIT),
|
||||
RETURN_MASK_ERROR = RETURN_MASK (RETURN_ERROR),
|
||||
RETURN_MASK_ALL = (RETURN_MASK_QUIT | RETURN_MASK_ERROR)
|
||||
} return_mask;
|
||||
|
||||
/* Describe all exceptions. */
|
||||
|
||||
|
|
Loading…
Reference in New Issue