From ec63b14f8fcd0a88515e4260e00c41b77c0274cc Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 3 Feb 2012 14:53:53 +0100 Subject: [PATCH] Don't use reserved keywords. "or", "and", and "not" are reserved keywords in C++, and this line breaks compilation of C++ code. Since the literal constants defined here are never used, comment their definition, and simply declare the field as an int. --- include/xbt/automaton.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h index f140ed2e82..33acf99398 100644 --- a/include/xbt/automaton.h +++ b/include/xbt/automaton.h @@ -28,7 +28,9 @@ typedef struct xbt_automaton { typedef struct xbt_automaton* xbt_automaton_t; typedef struct xbt_exp_label{ - enum{or=0, and=1, not=2, predicat=3, one=4} type; + /* fixme: "or", "and", and "not" are reserved keywords in C++ */ + /* enum{or=0, and=1, not=2, predicat=3, one=4} type; */ + int type; union{ struct{ struct xbt_exp_label* left_exp; -- 2.20.1