#2 FIX: unmatched actuals in instantiation

open-accepted
nobody
None
6
2002-08-20
2002-08-01
Anonymous
No

This patch fixes a compilation problem that occurred
when compiling the CVS head. The symptom was:

qdal-dataset.ads:133:03: unmatched actuals in instantiation
qdal-dataset.ads:133:03: instantiation error at
bc-containers-queues-unbounded.ads:76
qdal-dataset.ads:133:03: type of actual does not match
type of "Storage"
qdal-dataset.ads:133:03: instantiation error at
bc-support-unbounded.ads:86
qdal-dataset.ads:133:03: instantiation error at
bc-containers-queues-unbounded.ads:73
qdal-dataset.ads:133:03: type of actual does not match
type of "Storage"
qdal-dataset.ads:135:27: type of actual does not match
type of "Storage"

Here is the patch:

diff -u -w -r1.3 qdal-dataset.ads
--- qdal-dataset.ads 24 Jul 2002 19:21:29 -0000 1.3
+++ qdal-dataset.ads 1 Aug 2002 23:49:20 -0000
@@ -26,7 +26,7 @@
with BC.Containers;
with BC.Containers.Queues;
with BC.Containers.Queues.Unbounded;
-with Global_Heap;
+with BC.Support.Standard_Storage;

with QDAL.Double_Linked_List;
with QDAL.Parse; use QDAL.Parse;
@@ -131,8 +131,7 @@
);
package Error_Container_Queue is new
Error_Container.Queues;
package Error_Queue is new
Error_Container_Queue.Unbounded (
- Storage_Manager => Global_Heap.Pool,
- Storage => Global_Heap.Storage
+ Storage => BC.Support.Standard_Storage.Pool
);
use Error_Queue;
-- Error messages are queued in this format so that

Note also that the package "Global_Storage" is part of
the demonstration programs that come with the Booch
Components. It is neither part of the Booch Components
themselves nor of Zephyr Basecamp.

--
Ludo.

Discussion

  • Logged In: YES
    user_id=428304

    The Ada Booch Components will be removed from ZBC in the
    future, but until that time, this is a good patch - Thanks
    also to Ludo for adding the Note at the end re
    Global_Storage. Right on mark.

     
    • status: open --> open-accepted
     
    • priority: 5 --> 6