diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-12-10 17:45:43 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-12-10 17:45:43 +0000 |
| commit | 8b2d1d64b886db4cff74e2a7b1370841979001b2 (patch) | |
| tree | 522c31719d0aff3bd0c9d42ed7eddf6ada3c4c12 /src/util | |
| parent | 2f121daa042c6f25a3f9ed8ece60ac5dccb11976 (diff) | |
cleanups, assert work, add a stubbed uf theory, fix driver
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Assert.cpp | 2 | ||||
| -rw-r--r-- | src/util/Assert.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/util/Assert.cpp b/src/util/Assert.cpp index 799af12ab..a86e2021a 100644 --- a/src/util/Assert.cpp +++ b/src/util/Assert.cpp @@ -28,7 +28,7 @@ void AssertionException::construct(const char* header, const char* extra, va_list args) { // try building the exception msg with a smallish buffer first, // then with a larger one if sprintf tells us to. - int n = 256; + int n = 512; char* buf; for(;;) { diff --git a/src/util/Assert.h b/src/util/Assert.h index 3da76c5db..c3b81727c 100644 --- a/src/util/Assert.h +++ b/src/util/Assert.h @@ -137,15 +137,15 @@ public: #define AlwaysAssert(cond, msg...) \ do { \ if(EXPECT_FALSE( ! (cond) )) { \ - throw AssertionException(#cond, __FUNCTION__, __FILE__, __LINE__, ## msg); \ + throw AssertionException(#cond, __PRETTY_FUNCTION__, __FILE__, __LINE__, ## msg); \ } \ } while(0) #define Unreachable(msg...) \ - throw UnreachableCodeException(__FUNCTION__, __FILE__, __LINE__, ## msg) + throw UnreachableCodeException(__PRETTY_FUNCTION__, __FILE__, __LINE__, ## msg) #define Unhandled(msg...) \ - throw UnhandledCaseException(__FUNCTION__, __FILE__, __LINE__, ## msg) + throw UnhandledCaseException(__PRETTY_FUNCTION__, __FILE__, __LINE__, ## msg) #define IllegalArgument(arg, msg...) \ - throw IllegalArgumentException(#arg, __FUNCTION__, __FILE__, __LINE__, ## msg) + throw IllegalArgumentException(#arg, __PRETTY_FUNCTION__, __FILE__, __LINE__, ## msg) #ifdef CVC4_ASSERTIONS # define Assert(cond, msg...) AlwaysAssert(cond, ## msg) |