From 11c2b9bbc790216eeb22a1e4d4de8161394c3fbf Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 12 Apr 2009 21:13:43 +0000 Subject: Use Dimension::SEVERITY_* rather than DMNSN_SEVERITY for calling dmnsn_error from C++. --- libdimension/dimension/error.h | 5 +++-- libdimensionxx/png.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libdimension/dimension/error.h b/libdimension/dimension/error.h index 858ff96..3204cb2 100644 --- a/libdimension/dimension/error.h +++ b/libdimension/dimension/error.h @@ -32,8 +32,9 @@ typedef enum { } dmnsn_severity; /* Use this to report an error */ -#define dmnsn_error(severity, str) \ - dmnsn_report_error(severity, __PRETTY_FUNCTION__, __LINE__, str) +#define dmnsn_error(severity, str) \ + dmnsn_report_error((dmnsn_severity)severity, __PRETTY_FUNCTION__, __LINE__, \ + str) /* Called by dmnsn_error() - don't call directly */ void dmnsn_report_error(dmnsn_severity severity, diff --git a/libdimensionxx/png.cpp b/libdimensionxx/png.cpp index 348b7a7..cd4925e 100644 --- a/libdimensionxx/png.cpp +++ b/libdimensionxx/png.cpp @@ -34,7 +34,7 @@ namespace Dimension try { write(); } catch (...) { - dmnsn_error(DMNSN_SEVERITY_MEDIUM, + dmnsn_error(SEVERITY_MEDIUM, "Writing canvas to PNG failed in PNG_Canvas destructor."); } } -- cgit v1.2.3