Commit 35fdafcd by Arnaud Charlet

Recommit wrongly reverted change.

From-SVN: r216924
parent f11ac8e7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
-- -- -- --
-- B o d y -- -- B o d y --
-- -- -- --
-- Copyright (C) 2004-2013, Free Software Foundation, Inc. -- -- Copyright (C) 2004-2014, Free Software Foundation, Inc. --
-- -- -- --
-- GNAT is free software; you can redistribute it and/or modify it under -- -- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- -- -- terms of the GNU General Public License as published by the Free Soft- --
...@@ -1217,6 +1217,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is ...@@ -1217,6 +1217,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
Position : out Cursor; Position : out Cursor;
Count : Count_Type := 1) Count : Count_Type := 1)
is is
First : Tree_Node_Access;
Last : Tree_Node_Access; Last : Tree_Node_Access;
Element : Element_Access; Element : Element_Access;
...@@ -1249,8 +1250,6 @@ package body Ada.Containers.Indefinite_Multiway_Trees is ...@@ -1249,8 +1250,6 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
with "attempt to tamper with cursors (tree is busy)"; with "attempt to tamper with cursors (tree is busy)";
end if; end if;
Position.Container := Parent.Container;
declare declare
-- The element allocator may need an accessibility check in the case -- The element allocator may need an accessibility check in the case
-- the actual type is class-wide or has access discriminants (see -- the actual type is class-wide or has access discriminants (see
...@@ -1264,16 +1263,16 @@ package body Ada.Containers.Indefinite_Multiway_Trees is ...@@ -1264,16 +1263,16 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
Element := new Element_Type'(New_Item); Element := new Element_Type'(New_Item);
end; end;
Position.Node := new Tree_Node_Type'(Parent => Parent.Node, First := new Tree_Node_Type'(Parent => Parent.Node,
Element => Element, Element => Element,
others => <>); others => <>);
Last := Position.Node;
Last := First;
for J in Count_Type'(2) .. Count loop for J in Count_Type'(2) .. Count loop
-- Reclaim other nodes if Storage_Error. ??? -- Reclaim other nodes if Storage_Error. ???
Element := new Element_Type'(New_Item); Element := new Element_Type'(New_Item);
Last.Next := new Tree_Node_Type'(Parent => Parent.Node, Last.Next := new Tree_Node_Type'(Parent => Parent.Node,
Prev => Last, Prev => Last,
Element => Element, Element => Element,
...@@ -1283,7 +1282,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is ...@@ -1283,7 +1282,7 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
end loop; end loop;
Insert_Subtree_List Insert_Subtree_List
(First => Position.Node, (First => First,
Last => Last, Last => Last,
Parent => Parent.Node, Parent => Parent.Node,
Before => Before.Node); Before => Before.Node);
...@@ -1293,6 +1292,8 @@ package body Ada.Containers.Indefinite_Multiway_Trees is ...@@ -1293,6 +1292,8 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
-- nodes we just inserted. -- nodes we just inserted.
Container.Count := Container.Count + Count; Container.Count := Container.Count + Count;
Position := Cursor'(Parent.Container, First);
end Insert_Child; end Insert_Child;
------------------------- -------------------------
......
...@@ -3569,11 +3569,15 @@ package body Freeze is ...@@ -3569,11 +3569,15 @@ package body Freeze is
Next_Entity (Comp); Next_Entity (Comp);
end loop; end loop;
SSO_ADC := Get_Attribute_Definition_Clause -- Deal with default setting of reverse storage order
(Rec, Attribute_Scalar_Storage_Order);
Set_SSO_From_Default (Rec);
-- Check consistent attribute setting on component types -- Check consistent attribute setting on component types
SSO_ADC := Get_Attribute_Definition_Clause
(Rec, Attribute_Scalar_Storage_Order);
declare declare
Comp_ADC_Present : Boolean; Comp_ADC_Present : Boolean;
begin begin
...@@ -3589,10 +3593,6 @@ package body Freeze is ...@@ -3589,10 +3593,6 @@ package body Freeze is
end loop; end loop;
end; end;
-- Deal with default setting of reverse storage order
Set_SSO_From_Default (Rec);
-- Now deal with reverse storage order/bit order issues -- Now deal with reverse storage order/bit order issues
if Present (SSO_ADC) then if Present (SSO_ADC) then
......
...@@ -171,6 +171,7 @@ package body Opt is ...@@ -171,6 +171,7 @@ package body Opt is
Ada_Version := Ada_Version_Runtime; Ada_Version := Ada_Version_Runtime;
Ada_Version_Pragma := Empty; Ada_Version_Pragma := Empty;
Default_SSO := ' ';
Dynamic_Elaboration_Checks := False; Dynamic_Elaboration_Checks := False;
Extensions_Allowed := True; Extensions_Allowed := True;
External_Name_Exp_Casing := As_Is; External_Name_Exp_Casing := As_Is;
...@@ -194,7 +195,6 @@ package body Opt is ...@@ -194,7 +195,6 @@ package body Opt is
Assertions_Enabled := Assertions_Enabled_Config; Assertions_Enabled := Assertions_Enabled_Config;
Assume_No_Invalid_Values := Assume_No_Invalid_Values_Config; Assume_No_Invalid_Values := Assume_No_Invalid_Values_Config;
Check_Policy_List := Check_Policy_List_Config; Check_Policy_List := Check_Policy_List_Config;
Default_SSO := Default_SSO_Config;
SPARK_Mode := SPARK_Mode_Config; SPARK_Mode := SPARK_Mode_Config;
SPARK_Mode_Pragma := SPARK_Mode_Pragma_Config; SPARK_Mode_Pragma := SPARK_Mode_Pragma_Config;
else else
......
...@@ -797,6 +797,8 @@ package body System.OS_Lib is ...@@ -797,6 +797,8 @@ package body System.OS_Lib is
return C_Create_File (C_Name (C_Name'First)'Address); return C_Create_File (C_Name (C_Name'First)'Address);
end Create_New_Output_Text_File; end Create_New_Output_Text_File;
-- Start of processing for Create_Temp_File_Internal
begin begin
-- Loop until a new temp file can be created -- Loop until a new temp file can be created
......
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