diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 17:44:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-27 08:55:56 +0100 |
| commit | 7af733d9ef65fddd12ef5fae82808ba2f7f608df (patch) | |
| tree | 360afc7f8c5b7963730885255f631c9896f683b4 /vcl/source | |
| parent | 05f5c4d4d6addf5321a40595f598e55dce376f6f (diff) | |
tweak assert so comment appears in abort message
Change-Id: Ibf78e5cd1620f0b61cae030e3870be4a6f87e71d
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/fontsubset/cff.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/bmpfast.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index a1c59ef0819b..f9fee0b6220e 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -626,7 +626,7 @@ void Application::InitSettings() { ImplSVData* pSVData = ImplGetSVData(); - assert(!pSVData->maAppData.mpSettings); // initialization should not happen twice! + assert(!pSVData->maAppData.mpSettings && "initialization should not happen twice!"); pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener; pSVData->maAppData.mpSettings = new AllSettings(); diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 2d3ce6102307..5730fcc1d476 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -977,7 +977,7 @@ void CffSubsetterContext::convertOneTypeOp( void) read2push(); } else { popAll2Write( nType2Op); - assert( false); // TODO? + assert(false && "TODO?"); } break; } diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index b81a6c001221..7bfb28b7139e 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -593,7 +593,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, nDstLinestep = -nDstLinestep; } - assert(rDstBuffer.mnHeight <= rSrcBuffer.mnHeight); // not sure about that? + assert(rDstBuffer.mnHeight <= rSrcBuffer.mnHeight && "not sure about that?"); for (int y = rDstBuffer.mnHeight; --y >= 0;) { ImplBlendLines<8>( aDstLine, rSrcLine, aMskLine, rDstBuffer.mnWidth ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 12aa2323d5d9..9cf4725d5b33 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -779,7 +779,7 @@ bool Dialog::ImplStartExecuteModal() << "\"cancelled in silent mode"); return false; default: - assert(false); // this cannot happen + assert(false && "this cannot happen"); // fall through case Application::DIALOG_CANCEL_FATAL: std::abort(); |