* Dotted filenames for package fcl-stl

packages/fcl-stl/namespaced/System.Stl.ArrayUtils.pp

@@ -0,0 +1,3 @@
+unit System.Stl.ArrayUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i garrayutils.pp}

packages/fcl-stl/namespaced/System.Stl.Deque.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Deque;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gdeque.pp}

packages/fcl-stl/namespaced/System.Stl.HashMap.pp

@@ -0,0 +1,3 @@
+unit System.Stl.HashMap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ghashmap.pp}

packages/fcl-stl/namespaced/System.Stl.HashSet.pp

@@ -0,0 +1,3 @@
+unit System.Stl.HashSet;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ghashset.pp}

packages/fcl-stl/namespaced/System.Stl.LinkedList.pp

@@ -0,0 +1,3 @@
+unit System.Stl.LinkedList;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i glinkedlist.pp}

packages/fcl-stl/namespaced/System.Stl.Map.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Map;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gmap.pp}

packages/fcl-stl/namespaced/System.Stl.PriorityQueue.pp

@@ -0,0 +1,3 @@
+unit System.Stl.PriorityQueue;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gpriorityqueue.pp}

packages/fcl-stl/namespaced/System.Stl.Queue.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Queue;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gqueue.pp}

packages/fcl-stl/namespaced/System.Stl.Sets.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Sets;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gset.pp}

packages/fcl-stl/namespaced/System.Stl.Stack.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Stack;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gstack.pp}

packages/fcl-stl/namespaced/System.Stl.Tree.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Tree;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gtree.pp}

packages/fcl-stl/namespaced/System.Stl.Util.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Util;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gutil.pp}

packages/fcl-stl/namespaced/System.Stl.Vector.pp

@@ -0,0 +1,3 @@
+unit System.Stl.Vector;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gvector.pp}

packages/fcl-stl/namespaces.lst

@@ -0,0 +1,15 @@
+src/garrayutils.pp=namespaced/System.Stl.ArrayUtils.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/gdeque.pp=namespaced/System.Stl.Deque.pp
+src/gstack.pp=namespaced/System.Stl.Stack.pp
+src/ghashmap.pp=namespaced/System.Stl.HashMap.pp
+src/gset.pp=namespaced/System.Stl.Sets.pp
+src/gtree.pp=namespaced/System.Stl.Tree.pp
+src/ghashset.pp=namespaced/System.Stl.HashSet.pp
+src/gmap.pp=namespaced/System.Stl.Map.pp
+src/gpriorityqueue.pp=namespaced/System.Stl.PriorityQueue.pp
+src/gqueue.pp=namespaced/System.Stl.Queue.pp
+src/gutil.pp=namespaced/System.Stl.Util.pp
+src/gvector.pp=namespaced/System.Stl.Vector.pp
+src/glinkedlist.pp=namespaced/System.Stl.LinkedList.pp

packages/fcl-stl/src/garrayutils.pp

@@ -12,7 +12,9 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit garrayutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/fcl-stl/src/gdeque.pp

@@ -12,7 +12,9 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gdeque;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Implements a generic double ended queue.

packages/fcl-stl/src/ghashmap.pp

@@ -14,10 +14,16 @@
 
   { $define STL_INTERFACE_EXT}
 
+{$IFNDEF FPC_DOTTEDUNITS}
   unit ghashmap;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
+{$IFDEF FPC_DOTTEDUNITS}
+  uses System.Stl.Vector, System.Stl.Util, System.Stl.Arrayutils;
+{$ELSE FPC_DOTTEDUNITS}
   uses gvector, gutil, garrayutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
     baseFDataSize = 8;             // must be > 0
@@ -32,7 +38,7 @@
       hash(a: TKey, n: SizeUInt): SizeUInt;
               return uniformly distributed i value in range <0,n-1> base only on arguments,
               n will be always power of 2
-      equal(const AKey1, AKey2: TKey): Boolean;            [when STL_INTERFACE_EXT is defined]
+      equal(const AKey1, AKey2: TKey): Boolean;            [when Stl_INTERFACE_EXT is defined]
               return the boolean test for equality of the two keys.  Typically this is operator=,
               but it doesn't have to be (e.g. case-insensitive string comparison)
   }
@@ -170,7 +176,7 @@ begin
   bs:=curbucket.size;
   i:=0;
   while i < bs do begin
-{$ifdef STL_INTERFACE_EXT}
+{$ifdef Stl_INTERFACE_EXT}
     if THash.equal(curbucket[i].Key, key) then exit(true);
 {$else}
     if (curbucket[i].Key = key) then exit(true);
@@ -188,7 +194,7 @@ begin
   bs:=curbucket.size;
   i:=0;
   while i < bs do begin
-{$ifdef STL_INTERFACE_EXT}
+{$ifdef Stl_INTERFACE_EXT}
     if THash.equal(curbucket[i].Key, key) then exit(curbucket[i].Value);
 {$else}
     if (curbucket[i].Key = key) then exit(curbucket[i].Value);
@@ -207,7 +213,7 @@ begin
   bs:=curbucket.size;
   i:=0;
   while i < bs do begin
-{$ifdef STL_INTERFACE_EXT}
+{$ifdef Stl_INTERFACE_EXT}
     if THash.equal(curbucket[i].Key, key) then begin
 {$else}
     if (curbucket[i].Key = key) then begin
@@ -229,7 +235,7 @@ begin
   bs:=curbucket.size;
   i:=0;
   while i < bs do begin
-{$ifdef STL_INTERFACE_EXT}
+{$ifdef Stl_INTERFACE_EXT}
     if THash.equal(curbucket[i].Key, key) then begin
 {$else}
     if (curbucket[i].Key = key) then begin
@@ -256,7 +262,7 @@ begin
   bs:=curbucket.size;
   i:=0;
   while i < bs do begin
-{$ifdef STL_INTERFACE_EXT}
+{$ifdef Stl_INTERFACE_EXT}
     if THash.equal(curbucket[i].Key, key) then begin
 {$else}
     if (curbucket[i].Key = key) then begin

packages/fcl-stl/src/ghashset.pp

@@ -12,10 +12,16 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ghashset;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Stl.Vector, System.Stl.Util, System.Stl.Arrayutils;
+{$ELSE FPC_DOTTEDUNITS}
 uses gvector, gutil, garrayutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const baseFDataSize = 8;
 

packages/fcl-stl/src/glinkedlist.pp

@@ -14,7 +14,9 @@
 **********************************************************************}
 {
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit glinkedlist;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE DELPHI}
 

packages/fcl-stl/src/gmap.pp

@@ -12,11 +12,17 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gmap;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Stl.Sets;
+{$ELSE FPC_DOTTEDUNITS}
 uses gset;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   generic TMapCompare<TPair, TKeyCompare>=class

packages/fcl-stl/src/gpriorityqueue.pp

@@ -12,11 +12,17 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gpriorityqueue;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface 
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Stl.Vector;
+{$ELSE FPC_DOTTEDUNITS}
 uses gvector;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {TCompare is comparing class, which should have class method c(a,b:T):boolean, which returns true is a is less than b}
 

packages/fcl-stl/src/gqueue.pp

@@ -12,11 +12,17 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gqueue;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Stl.Deque;
+{$ELSE FPC_DOTTEDUNITS}
 uses gdeque;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type 
   generic TQueue<T>=class

packages/fcl-stl/src/gset.pp

@@ -12,7 +12,9 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gset;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/fcl-stl/src/gstack.pp

@@ -12,11 +12,17 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gstack;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.Stl.Vector;
+{$ELSE FPC_DOTTEDUNITS}
 uses gvector;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type 
   generic TStack<T>=class

packages/fcl-stl/src/gtree.pp

@@ -12,14 +12,21 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gtree;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Stl.Vector,System.Stl.Stack,System.Stl.Queue;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   gvector,gstack,gqueue;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
 

packages/fcl-stl/src/gutil.pp

@@ -12,7 +12,9 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gutil;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 

packages/fcl-stl/src/gvector.pp

@@ -12,7 +12,9 @@
 **********************************************************************}
 {$mode objfpc}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit gvector;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface