diff options
| author | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
| commit | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch) | |
| tree | 55596b47965261462217616f8271d0c2b9d79ab0 /mysys/my_new.cc | |
| parent | 9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff) | |
| parent | bd2db28cdad7e715b9efcee2f440f432a0562e8f (diff) | |
| download | mariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz | |
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
Diffstat (limited to 'mysys/my_new.cc')
| -rw-r--r-- | mysys/my_new.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_new.cc b/mysys/my_new.cc index babfe04d695..7da54ffac87 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw () C_MODE_START -int __cxa_pure_virtual() { - assert("Pure virtual method called." == "Aborted"); +int __cxa_pure_virtual() +{ + assert(! "Aborted: pure virtual method called."); return 0; } |