diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-10-21 20:24:13 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-10-21 20:24:13 -0700 |
| commit | 5c93850553c2c3aa3b9b82848a4adca90a0c8f2f (patch) | |
| tree | 7c004c9f0072e87019cae8e37b6bc078bd6423cf | |
| parent | c49f35835bd90e716ef0377f825562d850524566 (diff) | |
| download | abc-5c93850553c2c3aa3b9b82848a4adca90a0c8f2f.tar.gz abc-5c93850553c2c3aa3b9b82848a4adca90a0c8f2f.tar.bz2 abc-5c93850553c2c3aa3b9b82848a4adca90a0c8f2f.zip | |
Compiler problems.
| -rw-r--r-- | src/base/abci/abc.c | 6 | ||||
| -rw-r--r-- | src/sat/bsat2/Vec.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 1c3bf4da..1340836f 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -66,7 +66,7 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -//#define USE_MINISAT22 +#define USE_MINISAT22 static int Abc_CommandPrintStats ( Abc_Frame_t * pAbc, int argc, char ** argv ); static int Abc_CommandPrintExdc ( Abc_Frame_t * pAbc, int argc, char ** argv ); @@ -13272,6 +13272,8 @@ int Abc_CommandMinisat( Abc_Frame_t * pAbc, int argc, char ** argv ) #ifdef USE_MINISAT22 extern int MainSat(int argc, char** argv); MainSat( argc, argv ); +#else + printf( "This command is currently disabled.\n" ); #endif return 1; } @@ -13280,6 +13282,8 @@ int Abc_CommandMinisimp( Abc_Frame_t * pAbc, int argc, char ** argv ) #ifdef USE_MINISAT22 extern int MainSimp(int argc, char** argv); MainSimp( argc, argv ); +#else + printf( "This command is currently disabled.\n" ); #endif return 1; } diff --git a/src/sat/bsat2/Vec.h b/src/sat/bsat2/Vec.h index bb293ade..f0e07d01 100644 --- a/src/sat/bsat2/Vec.h +++ b/src/sat/bsat2/Vec.h @@ -96,7 +96,7 @@ template<class T> void vec<T>::capacity(int min_cap) { if (cap >= min_cap) return; int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1); // NOTE: grow by approximately 3/2 - if (add > INT_MAX - cap || ((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM) + if (add > INT_MAX - cap || (((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM)) throw OutOfMemoryException(); } |