Merge remote 'yield' work

diff --git a/include/impatomic.h b/include/impatomic.h
index 60e5d365efffc7bc365ef197be47275d31c23ae8..55486197c74c2834ac58b6a8ab507529835212f6 100644 (file)
--- a/include/impatomic.h
+++ b/include/impatomic.h
@@ -3902,11 +3902,11 @@ T* atomic<T*>::fetch_sub( ptrdiff_t __v__, memory_order __x__ ) volatile
 #ifdef __cplusplus
 extern "C" {
 #endif
-inline void atomic_thread_fence(memory_order order)
+static inline void atomic_thread_fence(memory_order order)
 { _ATOMIC_FENCE_(order); }
 
 /** @todo Do we want to try to support a user's signal-handler? */
-inline void atomic_signal_fence(memory_order order)
+static inline void atomic_signal_fence(memory_order order)
 { /* No-op? */ }
 #ifdef __cplusplus
 }

diff --git a/model.cc b/model.cc
index 8e513a3a47c972d70b0e9c3c6a9d72ba3e867171..55d5d0d43cfab46bac7a4d8e51987231526f6c33 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -2834,7 +2834,9 @@ static void print_list(action_list_t *list)
        unsigned int hash = 0;
 
        for (it = list->begin(); it != list->end(); it++) {
-               (*it)->print();
+               const ModelAction *act = *it;
+               if (act->get_seq_number() > 0)
+                       act->print();
                hash = hash^(hash<<3)^((*it)->hash());
        }
        model_print("HASH %u\n", hash);