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.

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index f140ed2..33acf99 100644 (file)
--- 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{
 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;
   union{
     struct{
       struct xbt_exp_label* left_exp;