diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-12 15:08:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-12 15:08:15 +0300 |
| commit | 7d762d70604d250cb51282161d390cba1ea664c7 (patch) | |
| tree | f5341950af8d4649f0d80c3092d5fb9c7c2daa9e /src/utils | |
| parent | 0cda45b8c1775c6a0f1bdf52c8801ccdfd21a8c7 (diff) | |
| download | manaplus-7d762d70604d250cb51282161d390cba1ea664c7.tar.gz manaplus-7d762d70604d250cb51282161d390cba1ea664c7.tar.bz2 manaplus-7d762d70604d250cb51282161d390cba1ea664c7.tar.xz manaplus-7d762d70604d250cb51282161d390cba1ea664c7.zip | |
Macro reportAlways also show message in log if asserts disabled in compile time.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/checkutils.h | 7 | ||||
| -rw-r--r-- | src/utils/xml/libxml.cpp | 7 | ||||
| -rw-r--r-- | src/utils/xml/pugixml.cpp | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h index b67c5d566..0423a0925 100644 --- a/src/utils/checkutils.h +++ b/src/utils/checkutils.h @@ -171,7 +171,12 @@ void reportStack(); #define reportFalseReal(val) (val) #define reportTrueReal(val) (val) -#define reportAlwaysReal(...) ; +#define reportAlwaysReal(...) \ + { \ + logger->log("Error:"); \ + logger->log( \ + __VA_ARGS__); \ + } #define returnFalseVReal(val) \ if (!val) \ diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index b03a32211..247d5cc9d 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -112,8 +112,8 @@ namespace XML size = CAST_S32(file.tellg()); if (size < 0) { - logger->log("Error loading XML file %s", filename.c_str()); - reportAlways("Error loading XML file %s", filename.c_str()); + reportAlways("Error loading XML file %s", + filename.c_str()); } else { @@ -125,7 +125,6 @@ namespace XML } else { - logger->log("Error loading XML file %s", filename.c_str()); reportAlways("Error loading XML file %s", filename.c_str()); } } @@ -137,13 +136,11 @@ namespace XML if (!mDoc) { - logger->log("Error parsing XML file %s", filename.c_str()); reportAlways("Error parsing XML file %s", filename.c_str()); } } else if (skipError == SkipError_false) { - logger->log("Error loading %s", filename.c_str()); reportAlways("Error loading XML file %s", filename.c_str()); } mIsValid = valid; diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index 62aa68cba..fe1564f2b 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -88,7 +88,6 @@ namespace XML size = CAST_S32(file.tellg()); if (size < 0) { - logger->log("Error loading XML file %s", filename.c_str()); reportAlways("Error loading XML file %s", filename.c_str()); } @@ -102,8 +101,8 @@ namespace XML } else { - logger->log("Error loading XML file %s", filename.c_str()); - reportAlways("Error loading XML file %s", filename.c_str()); + reportAlways("Error loading XML file %s", + filename.c_str()); } } @@ -129,7 +128,6 @@ namespace XML } else if (skipError == SkipError_false) { - logger->log("Error loading %s", filename.c_str()); reportAlways("Error loading %s", filename.c_str()); } mIsValid = valid; |