diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2017-07-04 22:24:57 +0000 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2017-07-04 22:24:57 +0000 |
| commit | 0b7dcbbcfbd1bb9481ee1ecc340d634e2d2ab513 (patch) | |
| tree | 258a472b144779aaeda90a03e3fa7130db4cca5b /src/aig/miniaig | |
| parent | 859e769f22195ba971de037c883c0d8552459fe7 (diff) | |
| parent | fcf82795cdb43c2148f35a671e80325dc25bb2a0 (diff) | |
| download | abc-0b7dcbbcfbd1bb9481ee1ecc340d634e2d2ab513.tar.gz abc-0b7dcbbcfbd1bb9481ee1ecc340d634e2d2ab513.tar.bz2 abc-0b7dcbbcfbd1bb9481ee1ecc340d634e2d2ab513.zip | |
Merged in boschmitt/abc (pull request #77)
Small fixes for C++ compilers
Diffstat (limited to 'src/aig/miniaig')
| -rw-r--r-- | src/aig/miniaig/ndr.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/aig/miniaig/ndr.h b/src/aig/miniaig/ndr.h index 9e85c870..22aa33e3 100644 --- a/src/aig/miniaig/ndr.h +++ b/src/aig/miniaig/ndr.h @@ -33,7 +33,7 @@ #include "abcOper.h" -//ABC_NAMESPACE_HEADER_START +ABC_NAMESPACE_HEADER_START #ifdef _WIN32 #define inline __inline @@ -390,11 +390,11 @@ static inline void Ndr_ModuleWriteVerilog( char * pFileName, void * pModule, cha // creating a new module (returns pointer to the memory buffer storing the module info) static inline void * Ndr_ModuleCreate( int Name ) { - Ndr_Data_t * p = malloc( sizeof(Ndr_Data_t) ); + Ndr_Data_t * p = ABC_ALLOC( Ndr_Data_t, 1 ); p->nSize = 0; p->nCap = 16; - p->pHead = malloc( p->nCap ); - p->pBody = malloc( p->nCap * 4 ); + p->pHead = ABC_ALLOC( unsigned char, p->nCap ); + p->pBody = ABC_ALLOC( unsigned int, p->nCap * 4 ); Ndr_DataPush( p, NDR_MODULE, 0 ); Ndr_DataPush( p, NDR_NAME, Name ); Ndr_DataAddTo( p, 0, p->nSize ); @@ -453,10 +453,10 @@ static inline void * Ndr_ModuleRead( char * pFileName ) assert( nFileSize % 5 == 0 ); rewind( pFile ); // create structure - p = malloc( sizeof(Ndr_Data_t) ); + p = ABC_ALLOC( Ndr_Data_t, 1 ); p->nSize = p->nCap = nFileSize / 5; - p->pHead = malloc( p->nCap ); - p->pBody = malloc( p->nCap * 4 ); + p->pHead = ABC_ALLOC( unsigned char, p->nCap ); + p->pBody = ABC_ALLOC( unsigned int, p->nCap * 4 ); RetValue = (int)fread( p->pBody, 4, p->nCap, pFile ); RetValue = (int)fread( p->pHead, 1, p->nCap, pFile ); assert( p->nSize == (int)p->pBody[0] ); @@ -511,7 +511,7 @@ static inline void Ndr_ModuleTest() } -//ABC_NAMESPACE_HEADER_END +ABC_NAMESPACE_HEADER_END #endif |