Merge pull request #11 from herrera-diego/herrera-diego/waiting-state

removed waiting-state folder
herrera-diego · Oct 11, 2021 · 49f6987 · 49f6987
2 parents 08ea58d + e0c4ab5
commit 49f6987
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/code/src/waiting-state/chopstick.cpp → code/src/chopstick.cpp b/code/src/waiting-state/chopstick.cpp → code/src/chopstick.cpp
diff --git a/code/src/waiting-state/chopstick.h → code/src/chopstick.h b/code/src/waiting-state/chopstick.h → code/src/chopstick.h
diff --git a/code/src/waiting-state/diningTable.cpp → code/src/diningTable.cpp b/code/src/waiting-state/diningTable.cpp → code/src/diningTable.cpp
diff --git a/code/src/waiting-state/diningTable.h → code/src/diningTable.h b/code/src/waiting-state/diningTable.h → code/src/diningTable.h
diff --git a/code/src/main.cpp b/code/src/main.cpp
@@ -1,4 +1,4 @@
-#include "waiting-state/diningTable.h"
+#include "diningTable.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/code/src/waiting-state/philosopher.cpp → code/src/philosopher.cpp b/code/src/waiting-state/philosopher.cpp → code/src/philosopher.cpp
diff --git a/code/src/waiting-state/philosopher.h → code/src/philosopher.h b/code/src/waiting-state/philosopher.h → code/src/philosopher.h
diff --git a/code/kill-ipcs.sh → code/unittest/kill-ipcs.sh b/code/kill-ipcs.sh → code/unittest/kill-ipcs.sh
diff --git a/code/unittest/test-waiting-state.cpp b/code/unittest/test-waiting-state.cpp
@@ -8,9 +8,9 @@
 #include <sys/sem.h>
 #include <sys/shm.h>
 
-#include "waiting-state/philosopher.h"
-#include "waiting-state/chopstick.h"
-#include "waiting-state/diningTable.h"
+#include "philosopher.h"
+#include "chopstick.h"
+#include "diningTable.h"
 #include "constants.h"
 
 using namespace WaitingPhilosopher;