diff options
Diffstat (limited to 'src/misc/vec')
-rw-r--r-- | src/misc/vec/vec.h | 8 | ||||
-rw-r--r-- | src/misc/vec/vecInt.h | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/misc/vec/vec.h b/src/misc/vec/vec.h index 40b46bc5..6a97fcaa 100644 --- a/src/misc/vec/vec.h +++ b/src/misc/vec/vec.h @@ -27,6 +27,10 @@ extern "C" { #ifdef _WIN32 #define inline __inline // compatible with MS VS 6.0 +#pragma warning(disable : 4152) // warning C4152: nonstandard extension, function/data pointer conversion in expression +#pragma warning(disable : 4244) // warning C4244: '+=' : conversion from 'int ' to 'unsigned short ', possible loss of data +#pragma warning(disable : 4514) // warning C4514: 'Vec_StrPop' : unreferenced inline function has been removed +#pragma warning(disable : 4710) // warning C4710: function 'Vec_PtrGrow' not inlined #endif //////////////////////////////////////////////////////////////////////// @@ -71,6 +75,10 @@ extern "C" { #define PRT(a,t) printf("%s = ", (a)); printf("%6.2f sec\n", (float)(t)/(float)(CLOCKS_PER_SEC)) #endif +#ifndef PRTP +#define PRTP(a,t,T) printf("%s = ", (a)); printf("%6.2f sec (%6.2f %%)\n", (float)(t)/(float)(CLOCKS_PER_SEC), (T)? 100.0*(t)/(T) : 0.0) +#endif + #include "vecInt.h" #include "vecFlt.h" #include "vecStr.h" diff --git a/src/misc/vec/vecInt.h b/src/misc/vec/vecInt.h index d1321c62..3afa39af 100644 --- a/src/misc/vec/vecInt.h +++ b/src/misc/vec/vecInt.h @@ -105,6 +105,28 @@ static inline Vec_Int_t * Vec_IntStart( int nSize ) /**Function************************************************************* + Synopsis [Allocates a vector with the given size and cleans it.] + + Description [] + + SideEffects [] + + SeeAlso [] + +***********************************************************************/ +static inline Vec_Int_t * Vec_IntStartNatural( int nSize ) +{ + Vec_Int_t * p; + int i; + p = Vec_IntAlloc( nSize ); + p->nSize = nSize; + for ( i = 0; i < nSize; i++ ) + p->pArray[i] = i; + return p; +} + +/**Function************************************************************* + Synopsis [Creates the vector from an integer array of the given size.] Description [] |