Commit 4931a11b authored by yoogx's avatar yoogx
Browse files

* Solve merge issues

parent 2011d6c4
...@@ -370,17 +370,11 @@ package body PolyORB_HI.Unprotected_Queue is ...@@ -370,17 +370,11 @@ package body PolyORB_HI.Unprotected_Queue is
Frst := Frst - 1; Frst := Frst - 1;
end loop; end loop;
end if; end if;
<<<<<<< HEAD
when Error => when Error =>
Put_Line (Verbose, Put_Line (Verbose,
CE + ": Store_In: FIFO is full"); CE + ": Store_In: FIFO is full");
-- XXX SHould raise an exception there ! -- XXX SHould raise an exception there !
=======
when Error =>
raise Program_Error with
CE + ": Store_In: FIFO is full";
>>>>>>> * Move Unprotected_Queue to a dedicated package
end case; end case;
-- Remove event in the history and shift -- Remove event in the history and shift
......
...@@ -56,12 +56,9 @@ generic ...@@ -56,12 +56,9 @@ generic
PolyORB_HI_Generated.Deployment.Port_Sized_String; PolyORB_HI_Generated.Deployment.Port_Sized_String;
-- An array type to specify the image of each port. -- An array type to specify the image of each port.
<<<<<<< HEAD
=======
type Address_Array is array (Port_Type) of System.Address; type Address_Array is array (Port_Type) of System.Address;
-- An array to specify a list of arrays of various sizes. -- An array to specify a list of arrays of various sizes.
>>>>>>> * Move Unprotected_Queue to a dedicated package
type Overflow_Protocol_Array is array (Port_Type) of type Overflow_Protocol_Array is array (Port_Type) of
Port_Kinds.Overflow_Handling_Protocol; Port_Kinds.Overflow_Handling_Protocol;
-- An array to specify the overflow_handling_protocol of each port -- An array to specify the overflow_handling_protocol of each port
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment