From 74194d46cb83ffe783bbc7358f541b6b7c4e5408 Mon Sep 17 00:00:00 2001 From: klmp200 Date: Sun, 10 Jun 2018 12:47:07 +0200 Subject: [PATCH] =?UTF-8?q?C'est=20quand=20m=C3=AAme=20mieux=20de=20v?= =?UTF-8?q?=C3=A9rifier=20si=20=C3=A7a=20compile=20avant=20de=20push?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Building/Building.c | 2 ++ Elevator/Elevator.c | 4 ++-- Elevator/Elevator.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Building/Building.c b/Building/Building.c index ff3d17a..229d3ad 100644 --- a/Building/Building.c +++ b/Building/Building.c @@ -122,6 +122,8 @@ int get_inside_elevator_Building(THIS(Building), int current_floor, Passenger pa for (i=0; ielevators[i]->get_floor(this->elevators[i]) == current_floor && this->elevators[i]->get_state(this->elevators[i]) == waiting){ + /* pour faire taire le compilateur le temps que je revienne sur cette fonction */ + printf("visiteur %s, de type %d\n", passenger.visitor->name, type); /* Il faut faire des trucs ici */ return i; } diff --git a/Elevator/Elevator.c b/Elevator/Elevator.c index 8705444..6aa5e73 100644 --- a/Elevator/Elevator.c +++ b/Elevator/Elevator.c @@ -7,8 +7,8 @@ SYNCHRONIZED_GETTER(Elevator, ELEVATOR_STATE, state) SYNCHRONIZED_SETTER(Elevator, ELEVATOR_STATE, state) -SYNCHRONIZED_GETTER(Elevator, ELEVATOR_STATE, floor) -SYNCHRONIZED_SETTER(Elevator, ELEVATOR_STATE, floor) +SYNCHRONIZED_GETTER(Elevator, int, floor) +SYNCHRONIZED_SETTER(Elevator, int, floor) void _free__Elevator(THIS(Elevator)){ DELETE(this->passenger_ids); diff --git a/Elevator/Elevator.h b/Elevator/Elevator.h index 3090d7c..2f670e8 100644 --- a/Elevator/Elevator.h +++ b/Elevator/Elevator.h @@ -25,7 +25,7 @@ typedef struct o_Elevator { PUBLIC void * (*runnable)(void * void_this); SYNCHRONIZE PRIVATE void (*set_state)(_THIS(Elevator), ELEVATOR_STATE var); - SYNCHRONIZE PRIVATE int (*set_floor)(_THIS(Elevator)); + SYNCHRONIZE PRIVATE void (*set_floor)(_THIS(Elevator), int var); SYNCHRONIZE PUBLIC void (*repair)(_THIS(Elevator)); SYNCHRONIZE PUBLIC int (*get_number_of_passengers)(_THIS(Elevator));