Reimplement table package (used instead of GNAT.Table).

2 files changed, 6 insertions, 8 deletions

diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index e3008b800..4bacd8902 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -19,7 +19,7 @@ with Ada.Command_Line; use Ada.Command_Line;
 with Ada.Text_IO; use Ada.Text_IO;
 with Ada.Characters.Latin_1;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
-with GNAT.Table;
+with Tables;
 with GNAT.Dynamic_Tables;
 with Libraries;
 with Name_Table; use Name_Table;
@@ -271,12 +271,11 @@ package body Ghdldrv is
       Free (Obj_File);
    end Do_Compile;
 
-   package Filelist is new GNAT.Table
+   package Filelist is new Tables
      (Table_Component_Type => String_Access,
       Table_Index_Type => Natural,
       Table_Low_Bound => 1,
-      Table_Initial => 16,
-      Table_Increment => 100);
+      Table_Initial => 16);
 
    Link_Obj_Suffix : String_Access;
 
diff --git a/src/ghdldrv/ghdlprint.adb b/src/ghdldrv/ghdlprint.adb
index d0d2d3a86..6d2ea4b55 100644
--- a/src/ghdldrv/ghdlprint.adb
+++ b/src/ghdldrv/ghdlprint.adb
@@ -19,7 +19,7 @@ with Ada.Characters.Latin_1;
 with Ada.Text_IO; use Ada.Text_IO;
 with GNAT.Directory_Operations;
 with GNAT.OS_Lib; use GNAT.OS_Lib;
-with GNAT.Table;
+with Tables;
 with Types; use Types;
 with Flags;
 with Name_Table; use Name_Table;
@@ -1044,12 +1044,11 @@ package body Ghdlprint is
       use Tokens;
       use Scanner;
 
-      package Ref_Tokens is new GNAT.Table
+      package Ref_Tokens is new Tables
         (Table_Component_Type => Token_Type,
          Table_Index_Type => Integer,
          Table_Low_Bound => 0,
-         Table_Initial => 1024,
-         Table_Increment => 100);
+         Table_Initial => 1024);
 
       Id : Name_Id;
       Fe : Source_File_Entry;