fix indentation + spacing, esp. for MEMALLOC macro

diff --git a/action.h b/action.h
index 4cc68479e347e5e50573b074ef625e1d013b73f5..005e65842e7353f9ca0dc50846eddf9bf054a111 100644 (file)
--- a/action.h
+++ b/action.h
@@ -46,7 +46,8 @@ public:
        inline bool operator >(const ModelAction& act) const {
                return get_seq_number() > act.get_seq_number();
        }
-  MEMALLOC
+
+       MEMALLOC
 private:
        action_type type;
        memory_order order;

diff --git a/model.h b/model.h
index 4718c503f9eac77a106d9505d49aca410b741d5b..99ec69e62eb6908e1db1ea104f0c05222b0f3d9c 100644 (file)
--- a/model.h
+++ b/model.h
@@ -42,7 +42,8 @@ public:
        int switch_to_master(ModelAction *act);
 
        bool next_execution();
-  MEMALLOC
+
+       MEMALLOC
 private:
        int next_thread_id;
        int used_sequence_numbers;

diff --git a/schedule.h b/schedule.h
index 68900a56918add354fe471418567c1d289eca49c..c99748c730a4812a303eecf2d30cfc0876a17bd5 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -15,7 +15,8 @@ public:
        Thread * next_thread(void);
        Thread * get_current_thread(void);
        void print();
-  MEMALLOC
+
+       MEMALLOC
 private:
        std::list<Thread *, MyAlloc< Thread * > > readyList;
        Thread *current;

diff --git a/threads.cc b/threads.cc
index 80957adf7b1709c015b4a30bc82deacc98767b92..d00e21228295b0f9bc7f86902a2a9bfcc2577947 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -25,7 +25,7 @@ Thread * thread_current(void)
 /* This method just gets around makecontext not being 64-bit clean */
 
 void thread_startup() {
-       Thread * curr_thread=thread_current();
+       Thread * curr_thread = thread_current();
        curr_thread->start_routine(curr_thread->arg);
 }
 

diff --git a/threads.h b/threads.h
index 57319067b4adb74255435cb721d723650900153c..ebe33a3631d3e6815b33ed12b1e47ba972f1a8b1 100644 (file)
--- a/threads.h
+++ b/threads.h
@@ -30,8 +30,10 @@ public:
        thread_id_t get_id();
        thrd_t get_thrd_t() { return *user_thread; }
        Thread * get_parent() { return parent; }
-  friend void thread_startup();
-  MEMALLOC
+
+       friend void thread_startup();
+
+       MEMALLOC
 private:
        int create_context();
        Thread *parent;