Deactivate this assert again.

[simgrid.git] / include / xbt / automaton.h

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 485f02b..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{
-  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;
@@ -103,7 +105,7 @@ XBT_PUBLIC(xbt_state_t) xbt_automaton_get_current_state(xbt_automaton_t a);
 
 XBT_PUBLIC(int) automaton_state_compare(xbt_state_t s1, xbt_state_t s2);
 
-XBT_PUBLIC(int) propositional_symbols_compare_value(const void *s1, const void *s2);
+XBT_PUBLIC(int) propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2);
 
 XBT_PUBLIC(int) automaton_transition_compare(const void *t1, const void *t2);