5 files changed, 16 insertions, 16 deletions

diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h
index 67c582e0..24a07e17 100644
--- a/src/map/mapper/mapper.h
+++ b/src/map/mapper/mapper.h
@@ -178,7 +178,7 @@ extern Map_Super_t *   Map_SuperTableLookupC( Map_SuperLib_t * pLib, unsigned uT
 /*=== mapperTime.c =============================================================*/
 /*=== mapperUtil.c =============================================================*/
 extern int             Map_ManCheckConsistency( Map_Man_t * p );
-extern st_table *      Map_CreateTableGate2Super( Map_Man_t * p );
+extern st__table *      Map_CreateTableGate2Super( Map_Man_t * p );
 extern void            Map_ManCleanData( Map_Man_t * p );
 extern void            Map_MappingSetupTruthTables( unsigned uTruths[][2] );
 extern void            Map_MappingSetupTruthTablesLarge( unsigned uTruths[][32] );
diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h
index 1740d4e9..442ca5eb 100644
--- a/src/map/mapper/mapperInt.h
+++ b/src/map/mapper/mapperInt.h
@@ -405,7 +405,7 @@ extern float             Map_MappingGetArea( Map_Man_t * pMan, Map_NodeVec_t * v
 /*=== mapperShow.c =============================================================*/
 extern void              Map_MappingShow( Map_Man_t * pMan, char * pFileName );
 /*=== mapperTree.c ===============================================================*/
-extern int               Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate );
+extern int               Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st__table * tExcludeGate );
 extern int               Map_LibraryReadFileTreeStr( Map_SuperLib_t * pLib, Vec_Str_t * vStr, char * pFileName );
 extern int               Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExcludeFile );
 extern void              Map_LibraryPrintTree( Map_SuperLib_t * pLib );
diff --git a/src/map/mapper/mapperSuper.c b/src/map/mapper/mapperSuper.c
index a8682a1b..9382575a 100644
--- a/src/map/mapper/mapperSuper.c
+++ b/src/map/mapper/mapperSuper.c
@@ -425,12 +425,12 @@ void Map_LibraryPrintSupergate( Map_Super_t * pGate )
 void Map_LibraryPrintClasses( Map_SuperLib_t * p )
 {
 /*
-    st_generator * gen;
+    st__generator * gen;
     Map_Super_t * pSuper, * pSuper2;
     unsigned Key, uTruth;
     int Counter = 0;
     // copy all the supergates into one array
-    st_foreach_item( p->tSuplib, gen, (char **)&Key, (char **)&pSuper )
+    st__foreach_item( p->tSuplib, gen, (char **)&Key, (char **)&pSuper )
     {
         for ( pSuper2 = pSuper; pSuper2; pSuper2 = pSuper2->pNext )
         {
diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c
index 62d11c53..9bf74ff2 100644
--- a/src/map/mapper/mapperTree.c
+++ b/src/map/mapper/mapperTree.c
@@ -265,7 +265,7 @@ int Map_LibraryReadTree2( Map_SuperLib_t * pLib, char * pFileName, char * pExclu
     FILE * pFile;
     int Status, num;
     Abc_Frame_t * pAbc;
-    st_table * tExcludeGate = 0;
+    st__table * tExcludeGate = 0;
 
     // read the beginning of the file
     assert( pLib->pGenlib == NULL );
@@ -281,10 +281,10 @@ int Map_LibraryReadTree2( Map_SuperLib_t * pLib, char * pFileName, char * pExclu
     {
         pAbc = Abc_FrameGetGlobalFrame();
         
-        tExcludeGate = st_init_table(strcmp, st_strhash);
+        tExcludeGate = st__init_table(strcmp, st__strhash);
         if ( (num = Mio_LibraryReadExclude( pExcludeFile, tExcludeGate )) == -1 )
         {
-            st_free_table( tExcludeGate );
+            st__free_table( tExcludeGate );
             tExcludeGate = 0;
             return 0;
         }
@@ -525,7 +525,7 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
     Vec_Str_t * vStr;
     int Status, num;
     Abc_Frame_t * pAbc;
-    st_table * tExcludeGate = 0;
+    st__table * tExcludeGate = 0;
 
     // read the beginning of the file
     assert( pLib->pGenlib == NULL );
@@ -542,10 +542,10 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
     {
         pAbc = Abc_FrameGetGlobalFrame();
         
-        tExcludeGate = st_init_table(strcmp, st_strhash);
+        tExcludeGate = st__init_table(strcmp, st__strhash);
         if ( (num = Mio_LibraryReadExclude( pExcludeFile, tExcludeGate )) == -1 )
         {
-            st_free_table( tExcludeGate );
+            st__free_table( tExcludeGate );
             tExcludeGate = 0;
             Vec_StrFree( vStr );
             return 0;
@@ -580,7 +580,7 @@ int Map_LibraryReadTree( Map_SuperLib_t * pLib, char * pFileName, char * pExclud
   SeeAlso     []
 
 ***********************************************************************/
-int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate )
+int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st__table * tExcludeGate )
 {
     Map_Super_t * pGate, * pFanin;
     Mio_Pin_t * pPin;
@@ -595,7 +595,7 @@ int Map_LibraryDeriveGateInfo( Map_SuperLib_t * pLib, st_table * tExcludeGate )
 
         if ( tExcludeGate )
         {
-            if ( st_is_member( tExcludeGate, Mio_GateReadName( pGate->pRoot ) ) )
+            if ( st__is_member( tExcludeGate, Mio_GateReadName( pGate->pRoot ) ) )
                 pGate->fExclude = 1;
             for ( k = 0; k < (int)pGate->nFanins; k++ )
             {
diff --git a/src/map/mapper/mapperUtils.c b/src/map/mapper/mapperUtils.c
index e49c4dd4..fbee6f74 100644
--- a/src/map/mapper/mapperUtils.c
+++ b/src/map/mapper/mapperUtils.c
@@ -787,12 +787,12 @@ int Map_MappingCountDoubles( Map_Man_t * pMan, Map_NodeVec_t * vNodes )
   SeeAlso     []
 
 ***********************************************************************/
-st_table * Map_CreateTableGate2Super( Map_Man_t * pMan )
+ st__table * Map_CreateTableGate2Super( Map_Man_t * pMan )
 {
     Map_Super_t * pSuper;
-    st_table * tTable;
+    st__table * tTable;
     int i, nInputs, v;
-    tTable = st_init_table(strcmp, st_strhash);
+    tTable = st__init_table(strcmp, st__strhash);
     for ( i = 0; i < pMan->pSuperLib->nSupersAll; i++ )
     {
         pSuper = pMan->pSuperLib->ppSupers[i];
@@ -806,7 +806,7 @@ st_table * Map_CreateTableGate2Super( Map_Man_t * pMan )
             if ( v != nInputs )
                 continue;
 //            printf( "%s\n", Mio_GateReadName(pSuper->pRoot) );
-            if ( st_insert( tTable, (char *)pSuper->pRoot, (char *)pSuper ) )
+            if ( st__insert( tTable, (char *)pSuper->pRoot, (char *)pSuper ) )
             {
                 assert( 0 );
             }