Browse Source

C'est quand même mieux de vérifier si ça compile avant de push

merge-requests/1/head
Antoine Bartuccio 4 years ago
parent
commit
74194d46cb
Signed by: klmp200 GPG Key ID: E7245548C53F904B
  1. 2
      Building/Building.c
  2. 4
      Elevator/Elevator.c
  3. 2
      Elevator/Elevator.h

2
Building/Building.c

@ -122,6 +122,8 @@ int get_inside_elevator_Building(THIS(Building), int current_floor, Passenger pa
for (i=0; i<ELEVATOR_NB; i++){
if (this->elevators[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;
}

4
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);

2
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));

Loading…
Cancel
Save