--- a/Make.spec Mon Aug 07 15:27:07 2006 +0200
+++ b/Make.spec Tue Aug 08 16:18:08 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.spec,v 1.22 2006-07-14 17:29:49 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.spec,v 1.23 2006-08-08 14:18:08 cg Exp $
#
MODULE=stx
@@ -35,7 +35,6 @@
$(OUTDIR)Base64Coder.$(O) \
$(OUTDIR)FileSorter.$(O) \
$(OUTDIR)MappedCollection.$(O) \
- $(OUTDIR)KeyedCollection.$(O) \
$(OUTDIR)TwoByteString.$(O) \
$(OUTDIR)Unicode16String.$(O) \
$(OUTDIR)JISEncodedString.$(O) \
--- a/abbrev.stc Mon Aug 07 15:27:07 2006 +0200
+++ b/abbrev.stc Tue Aug 08 16:18:08 2006 +0200
@@ -24,7 +24,7 @@
DecNetSocketAddress DecNetSocketAddress stx:libbasic2 'OS-Sockets' 0
DirectoryContents DirectoryContents stx:libbasic2 'System-Support' 0
EllipticalArc EllipticalArc stx:libbasic2 'Graphics-Geometry-Objects' 0
-EpsonFX1PrinterStream EpsonFX1PrinterStream stx:libbasic2 'Streams-External-Printing' 0
+EpsonFX1PrinterStream EpsonFX1PrinterStream stx:libbasic2 'Interface-Printing' 0
ExternalLong ExternalLong stx:libbasic2 'System-Support' 0
FileSorter FileSorter stx:libbasic2 'Interface-Tools-File' 0
FileText FileText stx:libbasic2 'Collections-Text' 0
@@ -32,7 +32,7 @@
FourByteString FourByteString stx:libbasic2 'Collections-Text' 0
FtpURI FtpURI stx:libbasic2 'Net-Resources' 0
GBEncodedString GBEncodedString stx:libbasic2 'Collections-Text' 0
-HPLjetIIPrinterStream HPLjetIIPrinterStream stx:libbasic2 'Streams-External-Printing' 0
+HPLjetIIPrinterStream HPLjetIIPrinterStream stx:libbasic2 'Interface-Printing' 0
HandlerCollection HandlerCollection stx:libbasic2 'Kernel-Exceptions' 0
HierarchicalURI HierarchicalURI stx:libbasic2 'Net-Resources' 0
HostAddressLookupError HostAddressLookupError stx:libbasic2 'Kernel-Exceptions-Errors' 0
@@ -46,7 +46,6 @@
Iterator Iterator stx:libbasic2 'Collections-Sequenceable' 0
JISEncodedString JISEncodedString stx:libbasic2 'Collections-Text' 0
KSCEncodedString KSCEncodedString stx:libbasic2 'Collections-Text' 0
-KeyedCollection KeyedCollection stx:libbasic2 'Collections-Abstract' 0
KeywordInContextIndexBuilder KeywordInContextIndexBuilder stx:libbasic2 'Collections-Support' 0
LazyArray LazyArray stx:libbasic2 'Collections-Arrayed' 0
LazyCons LazyCons stx:libbasic2 'Collections-Linked' 0
@@ -63,9 +62,9 @@
OrderedDictionary OrderedDictionary stx:libbasic2 'Collections-Sequenceable' 0
OrderedSet OrderedSet stx:libbasic2 'Collections-Sequenceable' 0
Polygon Polygon stx:libbasic2 'Graphics-Geometry-Objects' 0
-PostscriptPrinterStream PostscriptPrinterStream stx:libbasic2 'Streams-External-Printing' 0
+PostscriptPrinterStream PostscriptPrinterStream stx:libbasic2 'Interface-Printing' 0
PowerSet PowerSet stx:libbasic2 'Collections-Unordered' 0
-PrinterStream PrinterStream stx:libbasic2 'Streams-External-Printing' 8
+PrinterStream PrinterStream stx:libbasic2 'Interface-Printing' 8
PrintfScanf PrintfScanf stx:libbasic2 'System-Support' 0
Promise Promise stx:libbasic2 'Kernel-Processes' 0
Queue Queue stx:libbasic2 'Collections-Ordered' 0
--- a/libInit.cc Mon Aug 07 15:27:07 2006 +0200
+++ b/libInit.cc Tue Aug 08 16:18:08 2006 +0200
@@ -24,7 +24,6 @@
_Base64Coder_Init(pass,__pRT__,snd);
_FileSorter_Init(pass,__pRT__,snd);
_MappedCollection_Init(pass,__pRT__,snd);
-_KeyedCollection_Init(pass,__pRT__,snd);
_TwoByteString_Init(pass,__pRT__,snd);
_Unicode16String_Init(pass,__pRT__,snd);
_JISEncodedString_Init(pass,__pRT__,snd);