summaryrefslogtreecommitdiffstats
path: root/src/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/misc')
-rw-r--r--src/misc/vec/vecFlt.h4
-rw-r--r--src/misc/vec/vecInt.h4
-rw-r--r--src/misc/vec/vecQue.h10
3 files changed, 13 insertions, 5 deletions
diff --git a/src/misc/vec/vecFlt.h b/src/misc/vec/vecFlt.h
index 6b4b8f9b..43e34217 100644
--- a/src/misc/vec/vecFlt.h
+++ b/src/misc/vec/vecFlt.h
@@ -267,6 +267,10 @@ static inline float * Vec_FltArray( Vec_Flt_t * p )
{
return p->pArray;
}
+static inline float ** Vec_FltArrayP( Vec_Flt_t * p )
+{
+ return &p->pArray;
+}
/**Function*************************************************************
diff --git a/src/misc/vec/vecInt.h b/src/misc/vec/vecInt.h
index 2fe15792..a99e6f29 100644
--- a/src/misc/vec/vecInt.h
+++ b/src/misc/vec/vecInt.h
@@ -321,6 +321,10 @@ static inline int * Vec_IntArray( Vec_Int_t * p )
{
return p->pArray;
}
+static inline int ** Vec_IntArrayP( Vec_Int_t * p )
+{
+ return &p->pArray;
+}
/**Function*************************************************************
diff --git a/src/misc/vec/vecQue.h b/src/misc/vec/vecQue.h
index 445c6fb3..18b8bc10 100644
--- a/src/misc/vec/vecQue.h
+++ b/src/misc/vec/vecQue.h
@@ -44,10 +44,10 @@ struct Vec_Que_t_
int nSize;
int * pHeap;
int * pOrder;
- float * pCostsFlt; // owned by the caller
+ float ** pCostsFlt; // owned by the caller
};
-static inline float Vec_QueCost( Vec_Que_t * p, int v ) { return p->pCostsFlt ? p->pCostsFlt[v] : v; }
+static inline float Vec_QueCost( Vec_Que_t * p, int v ) { return *p->pCostsFlt ? (*p->pCostsFlt)[v] : v; }
////////////////////////////////////////////////////////////////////////
/// MACRO DEFINITIONS ///
@@ -92,9 +92,9 @@ static inline void Vec_QueFreeP( Vec_Que_t ** p )
Vec_QueFree( *p );
*p = NULL;
}
-static inline void Vec_QueSetCosts( Vec_Que_t * p, float * pCosts )
+static inline void Vec_QueSetCosts( Vec_Que_t * p, float ** pCosts )
{
-// assert( p->pCostsFlt == NULL );
+ assert( p->pCostsFlt == NULL );
p->pCostsFlt = pCosts;
}
static inline void Vec_QueGrow( Vec_Que_t * p, int nCapMin )
@@ -333,7 +333,7 @@ static inline void Vec_QueTest( Vec_Flt_t * vCosts )
// start the queue
p = Vec_QueAlloc( Vec_FltSize(vCosts) );
- Vec_QueSetCosts( p, Vec_FltArray(vCosts) );
+ Vec_QueSetCosts( p, Vec_FltArrayP(vCosts) );
for ( i = 0; i < Vec_FltSize(vCosts); i++ )
Vec_QuePush( p, i );
// Vec_QuePrint( p );