Commit 2011d6c4 authored by yoogx's avatar yoogx
Browse files

* Solve merge issues

parent 69e25ba8
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
<<<<<<< HEAD
-- Copyright (C) 2014-2015 ESA & ISAE. -- -- Copyright (C) 2014-2015 ESA & ISAE. --
-- -- -- --
-- PolyORB-HI is free software; you can redistribute it and/or modify under -- -- PolyORB-HI is free software; you can redistribute it and/or modify under --
...@@ -24,27 +23,6 @@ ...@@ -24,27 +23,6 @@
-- a copy of the GCC Runtime Library Exception along with this program; -- -- a copy of the GCC Runtime Library Exception along with this program; --
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- <http://www.gnu.org/licenses/>. -- -- <http://www.gnu.org/licenses/>. --
=======
-- Copyright (C) 2014 ESA & ISAE. --
-- --
-- PolyORB HI is free software; you can redistribute it and/or modify it --
-- under terms of the GNU General Public License as published by the Free --
-- Software Foundation; either version 2, or (at your option) any later. --
-- PolyORB HI is distributed in the hope that it will be useful, but --
-- WITHOUT ANY WARRANTY; without even the implied warranty of --
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General --
-- Public License for more details. You should have received a copy of the --
-- GNU General Public License distributed with PolyORB HI; see file --
-- COPYING. If not, write to the Free Software Foundation, 51 Franklin --
-- Street, Fifth Floor, Boston, MA 02111-1301, USA. --
-- --
-- As a special exception, if other files instantiate generics from this --
-- unit, or you link this unit with other files to produce an executable, --
-- this unit does not by itself cause the resulting executable to be --
-- covered by the GNU General Public License. This exception does not --
-- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. --
>>>>>>> * Move Unprotected_Queue to a dedicated package
-- -- -- --
-- PolyORB-HI/Ada is maintained by the TASTE project -- -- PolyORB-HI/Ada is maintained by the TASTE project --
-- (taste-users@lists.tuxfamily.org) -- -- (taste-users@lists.tuxfamily.org) --
...@@ -52,13 +30,6 @@ ...@@ -52,13 +30,6 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
with PolyORB_HI.Output; with PolyORB_HI.Output;
<<<<<<< HEAD
package body PolyORB_HI.Unprotected_Queue is
use PolyORB_HI.Port_Kinds;
use PolyORB_HI.Output;
=======
with PolyORB_HI.Utils; with PolyORB_HI.Utils;
package body PolyORB_HI.Unprotected_Queue is package body PolyORB_HI.Unprotected_Queue is
...@@ -69,7 +40,6 @@ package body PolyORB_HI.Unprotected_Queue is ...@@ -69,7 +40,6 @@ package body PolyORB_HI.Unprotected_Queue is
use PolyORB_HI_Generated.Deployment; use PolyORB_HI_Generated.Deployment;
use PolyORB_HI.Output; use PolyORB_HI.Output;
use PolyORB_HI.Utils; use PolyORB_HI.Utils;
>>>>>>> * Move Unprotected_Queue to a dedicated package
---------------- ----------------
-- Read_Event -- -- Read_Event --
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
-- -- -- --
-- S p e c -- -- S p e c --
-- -- -- --
<<<<<<< HEAD
-- Copyright (C) 2014-2015 ESA & ISAE. -- -- Copyright (C) 2014-2015 ESA & ISAE. --
-- -- -- --
-- PolyORB-HI is free software; you can redistribute it and/or modify under -- -- PolyORB-HI is free software; you can redistribute it and/or modify under --
...@@ -24,27 +23,6 @@ ...@@ -24,27 +23,6 @@
-- a copy of the GCC Runtime Library Exception along with this program; -- -- a copy of the GCC Runtime Library Exception along with this program; --
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
-- <http://www.gnu.org/licenses/>. -- -- <http://www.gnu.org/licenses/>. --
=======
-- Copyright (C) 2014 ESA & ISAE. --
-- --
-- PolyORB HI is free software; you can redistribute it and/or modify it --
-- under terms of the GNU General Public License as published by the Free --
-- Software Foundation; either version 2, or (at your option) any later. --
-- PolyORB HI is distributed in the hope that it will be useful, but --
-- WITHOUT ANY WARRANTY; without even the implied warranty of --
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General --
-- Public License for more details. You should have received a copy of the --
-- GNU General Public License distributed with PolyORB HI; see file --
-- COPYING. If not, write to the Free Software Foundation, 51 Franklin --
-- Street, Fifth Floor, Boston, MA 02111-1301, USA. --
-- --
-- As a special exception, if other files instantiate generics from this --
-- unit, or you link this unit with other files to produce an executable, --
-- this unit does not by itself cause the resulting executable to be --
-- covered by the GNU General Public License. This exception does not --
-- however invalidate any other reasons why the executable file might be --
-- covered by the GNU Public License. --
>>>>>>> * Move Unprotected_Queue to a dedicated package
-- -- -- --
-- PolyORB-HI/Ada is maintained by the TASTE project -- -- PolyORB-HI/Ada is maintained by the TASTE project --
-- (taste-users@lists.tuxfamily.org) -- -- (taste-users@lists.tuxfamily.org) --
...@@ -53,18 +31,12 @@ ...@@ -53,18 +31,12 @@
with Ada.Unchecked_Conversion; with Ada.Unchecked_Conversion;
With Ada.Real_Time; With Ada.Real_Time;
<<<<<<< HEAD
with PolyORB_HI_Generated.Deployment;
=======
With System; With System;
with PolyORB_HI_Generated.Deployment; with PolyORB_HI_Generated.Deployment;
with PolyORB_HI.Errors; with PolyORB_HI.Errors;
with PolyORB_HI.Messages; with PolyORB_HI.Messages;
>>>>>>> * Move Unprotected_Queue to a dedicated package
with PolyORB_HI.Port_Kinds; with PolyORB_HI.Port_Kinds;
with PolyORB_HI.Streams; with PolyORB_HI.Streams;
......
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